Mercurial > pidgin
diff libpurple/stun.c @ 20096:2a9f3a499b0d
merge of '34d642b12b7215d55fd032cd513a7e225715f19a'
and '7868c3b2b7d17c52916e4bb76305b7e3b68d3904'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 17 Sep 2007 03:47:45 +0000 |
parents | 6bf32c9e15a7 |
children | c38d72677c8a |
line wrap: on
line diff
--- a/libpurple/stun.c Mon Sep 17 03:34:11 2007 +0000 +++ b/libpurple/stun.c Mon Sep 17 03:47:45 2007 +0000 @@ -1,8 +1,9 @@ /** * @file stun.c STUN (RFC3489) Implementation * @ingroup core - * - * purple + */ + +/* purple * * STUN implementation inspired by jstun [http://jstun.javawi.de/] * @@ -22,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */