Mercurial > pidgin.yaz
diff libpurple/media.c @ 28400:f0eaa57f58c3
merge of 'a3cbe3e11bc3bb7a4c1ecd17011d62ffba9abedf'
and 'e44e56cf5f6cafb3f5e13b861940a3aa66cb7893'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 22 Aug 2009 02:59:15 +0000 |
| parents | 98d8c11e4937 8c991e09efcb |
| children | afa79877d972 |
line wrap: on
line diff
--- a/libpurple/media.c Sat Aug 22 02:55:18 2009 +0000 +++ b/libpurple/media.c Sat Aug 22 02:59:15 2009 +0000 @@ -21,7 +21,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 */ #include <string.h>