[empathy/next: 3/5] Merge branch 'master' into next

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy/next: 3/5] Merge branch 'master' into next
Date: Mon, 28 Oct 2013 08:32:22 +0000 (UTC)
commit 5eb3ade611a2845f4e1f9f74cfe63351f0270a25
Merge: 04341b6 7fd3e9d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Oct 25 11:45:58 2013 +0200

    Merge branch 'master' into next

 data/icons/Makefile.am                             |  124 -
 data/icons/hicolor_apps_16x16_im-aim.png           |  Bin 795 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-ekiga.png         |  Bin 844 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-facebook.png      |  Bin 552 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-gadugadu.png      |  Bin 775 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-gizmo.png         |  Bin 861 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-google-talk.png   |  Bin 828 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-groupwise.png     |  Bin 865 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-icq.png           |  Bin 936 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-irc.png           |  Bin 848 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-jabber.png        |  Bin 663 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-local-xmpp.png    |  Bin 891 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-meanwhile.png     |  Bin 938 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-msn.png           |  Bin 835 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-mxit.png          |  Bin 560 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-myspace.png       |  Bin 624 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-qq.png            |  Bin 823 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-sametime.png      |  Bin 817 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-silc.png          |  Bin 359 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-sip.png           |  Bin 630 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-yahoo.png         |  Bin 906 -> 0 bytes
 data/icons/hicolor_apps_16x16_im-zephyr.png        |  Bin 695 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-aim.png           |  Bin 1134 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-ekiga.png         |  Bin 1299 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-facebook.png      |  Bin 731 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-gadugadu.png      |  Bin 1207 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-gizmo.png         |  Bin 1301 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-google-talk.png   |  Bin 1252 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-groupwise.png     |  Bin 1330 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-icq.png           |  Bin 1359 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-irc.png           |  Bin 1218 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-jabber.png        |  Bin 953 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-local-xmpp.png    |  Bin 1293 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-meanwhile.png     |  Bin 1538 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-msn.png           |  Bin 1281 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-mxit.png          |  Bin 828 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-myspace.png       |  Bin 884 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-qq.png            |  Bin 1264 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-sametime.png      |  Bin 1225 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-silc.png          |  Bin 510 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-sip.png           |  Bin 824 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-yahoo.png         |  Bin 1261 -> 0 bytes
 data/icons/hicolor_apps_22x22_im-zephyr.png        |  Bin 995 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-aim.png           |  Bin 1218 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-ekiga.png         |  Bin 1431 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-gadugadu.png      |  Bin 1338 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-gizmo.png         |  Bin 1437 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-google-talk.png   |  Bin 1363 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-groupwise.png     |  Bin 1494 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-icq.png           |  Bin 1512 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-irc.png           |  Bin 1308 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-jabber.png        |  Bin 1013 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-local-xmpp.png    |  Bin 1562 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-meanwhile.png     |  Bin 1423 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-msn.png           |  Bin 1407 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-mxit.png          |  Bin 767 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-myspace.png       |  Bin 799 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-qq.png            |  Bin 1421 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-sametime.png      |  Bin 1398 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-silc.png          |  Bin 476 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-sip.png           |  Bin 816 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-yahoo.png         |  Bin 1411 -> 0 bytes
 data/icons/hicolor_apps_24x24_im-zephyr.png        |  Bin 1049 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-aim.png           |  Bin 1777 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-ekiga.png         |  Bin 2118 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-gadugadu.png      |  Bin 1986 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-gizmo.png         |  Bin 2061 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-google-talk.png   |  Bin 1893 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-groupwise.png     |  Bin 2164 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-icq.png           |  Bin 2121 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-irc.png           |  Bin 1695 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-jabber.png        |  Bin 1492 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-local-xmpp.png    |  Bin 2355 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-meanwhile.png     |  Bin 2086 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-msn.png           |  Bin 1660 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-mxit.png          |  Bin 998 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-myspace.png       |  Bin 1174 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-qq.png            |  Bin 2105 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-sametime.png      |  Bin 1994 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-silc.png          |  Bin 547 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-sip.png           |  Bin 1151 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-yahoo.png         |  Bin 1955 -> 0 bytes
 data/icons/hicolor_apps_32x32_im-zephyr.png        |  Bin 1500 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-aim.png           |  Bin 2953 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-ekiga.png         |  Bin 3706 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-facebook.png      |  Bin 1521 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-gadugadu.png      |  Bin 3210 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-gizmo.png         |  Bin 3284 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-google-talk.png   |  Bin 3043 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-groupwise.png     |  Bin 3817 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-icq.png           |  Bin 3418 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-irc.png           |  Bin 2428 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-jabber.png        |  Bin 2413 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-local-xmpp.png    |  Bin 4188 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-meanwhile.png     |  Bin 3647 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-msn.png           |  Bin 2778 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-mxit.png          |  Bin 1306 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-myspace.png       |  Bin 1619 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-qq.png            |  Bin 3653 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-sametime.png      |  Bin 3417 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-silc.png          |  Bin 749 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-sip.png           |  Bin 1405 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-yahoo.png         |  Bin 3211 -> 0 bytes
 data/icons/hicolor_apps_48x48_im-zephyr.png        |  Bin 2303 -> 0 bytes
 data/icons/hicolor_apps_scalable_im-aim.svg        |  183 -
 data/icons/hicolor_apps_scalable_im-ekiga.svg      |  441 -
 data/icons/hicolor_apps_scalable_im-gadugadu.svg   |  225 -
 data/icons/hicolor_apps_scalable_im-gizmo.svg      |  269 -
 .../icons/hicolor_apps_scalable_im-google-talk.svg |  301 -
 data/icons/hicolor_apps_scalable_im-groupwise.svg  |  215 -
 data/icons/hicolor_apps_scalable_im-icq.svg        |  200 -
 data/icons/hicolor_apps_scalable_im-irc.svg        |  785 -
 data/icons/hicolor_apps_scalable_im-jabber.svg     |  632 -
 data/icons/hicolor_apps_scalable_im-local-xmpp.svg |13059 ----------------
 data/icons/hicolor_apps_scalable_im-meanwhile.svg  |  174 -
 data/icons/hicolor_apps_scalable_im-msn.svg        |  174 -
 data/icons/hicolor_apps_scalable_im-mxit.svg       |  106 -
 data/icons/hicolor_apps_scalable_im-myspace.svg    |  109 -
 data/icons/hicolor_apps_scalable_im-qq.svg         |  290 -
 data/icons/hicolor_apps_scalable_im-sametime.svg   |  127 -
 data/icons/hicolor_apps_scalable_im-silc.svg       |  103 -
 data/icons/hicolor_apps_scalable_im-sip.svg        |  251 -
 data/icons/hicolor_apps_scalable_im-yahoo.svg      |  266 -
 data/icons/hicolor_apps_scalable_im-zephyr.svg     |  182 -
 data/icons/local-xmpp.svg                          |16338 --------------------
 src/empathy-accounts-dialog.c                      |    2 +
 126 files changed, 2 insertions(+), 34554 deletions(-)
---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]