Mercurial > pidgin
diff libpurple/media.h @ 28052:8bc115afec99
merge of '80b957274167b799f50a5a624aca956f6eb02714'
and '9658cdde3b9bf2fc7172a9e6463ab35939b906e8'
author | maiku@pidgin.im |
---|---|
date | Sat, 22 Aug 2009 04:03:09 +0000 |
parents | 8c991e09efcb |
children | 713987ae3215 |
line wrap: on
line diff
--- a/libpurple/media.h Sat Aug 22 04:02:22 2009 +0000 +++ b/libpurple/media.h Sat Aug 22 04:03:09 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 */ #ifndef _PURPLE_MEDIA_H_