Mercurial > pidgin
comparison libpurple/stun.c @ 20514:723b5a2f91ce
explicit merge of 'd565bd9a8e62d3302ac14bb7c3a68a52c0c6a65e'
and '791472752b3aab532e7fd551baa49e6e74a4cfe7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 16 Sep 2007 18:03:53 +0000 |
| parents | 44b4e8bd759b |
| children | 6bf32c9e15a7 |
comparison
equal
deleted
inserted
replaced
| 20513:8b8effa59cc6 | 20514:723b5a2f91ce |
|---|---|
| 20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 21 * GNU General Public License for more details. | 21 * GNU General Public License for more details. |
| 22 * | 22 * |
| 23 * You should have received a copy of the GNU General Public License | 23 * You should have received a copy of the GNU General Public License |
| 24 * along with this program; if not, write to the Free Software | 24 * along with this program; if not, write to the Free Software |
| 25 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 25 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 26 * | 26 * |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "internal.h" | 29 #include "internal.h" |
| 30 | 30 |