Mercurial > pidgin.yaz
comparison pidgin/pixmaps/Makefile.am @ 15926:5f9b7e2652f0
merge of '04076a446ca2bc48c37d00b8b255bc1311b6c51c'
and '8a20c90142cacba36041509da3a0e11499df3ebc'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 26 Mar 2007 02:48:09 +0000 |
parents | f771cdcc551a b4086a92568f |
children | 9ac4e6b097d3 |
comparison
equal
deleted
inserted
replaced
15851:f771cdcc551a | 15926:5f9b7e2652f0 |
---|---|
7 change-bgcolor-small.png \ | 7 change-bgcolor-small.png \ |
8 change-fgcolor-small.png \ | 8 change-fgcolor-small.png \ |
9 connect.png \ | 9 connect.png \ |
10 edit.png \ | 10 edit.png \ |
11 pidgin.png \ | 11 pidgin.png \ |
12 gaim.svg \ | 12 pidgin.svg \ |
13 info.png \ | 13 info.png \ |
14 insert-image.png \ | 14 insert-image.png \ |
15 insert-image-small.png \ | 15 insert-image-small.png \ |
16 insert-link-small.png \ | 16 insert-link-small.png \ |
17 insert-smiley-small.png \ | 17 insert-smiley-small.png \ |
18 logo.png \ | 18 logo.png \ |
21 offline.png \ | 21 offline.png \ |
22 online.png \ | 22 online.png \ |
23 pause.png \ | 23 pause.png \ |
24 phone.png \ | 24 phone.png \ |
25 send-im.png \ | 25 send-im.png \ |
26 status-online.png \ | 26 status-online.png \ |
27 status-offline.png \ | 27 status-offline.png \ |
28 status-away.png \ | 28 status-away.png \ |
29 status-invisible.png \ | 29 status-invisible.png \ |
30 status-typing0.png \ | 30 status-typing0.png \ |
31 status-typing1.png \ | 31 status-typing1.png \ |
44 text_bigger.png \ | 44 text_bigger.png \ |
45 text_normal.png \ | 45 text_normal.png \ |
46 text_smaller.png \ | 46 text_smaller.png \ |
47 typed.png \ | 47 typed.png \ |
48 typing.png \ | 48 typing.png \ |
49 window-icon.png \ | |
49 Makefile.mingw \ | 50 Makefile.mingw \ |
50 gaim.ico | 51 pidgin.ico |
51 | 52 |
52 | 53 |
53 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons | 54 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons |
54 gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png | 55 pidginbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png |
55 | 56 |
56 gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons | 57 pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons |
57 gaimiconpix_DATA = window-icon.png | 58 pidginiconpix_DATA = window-icon.png |
58 | 59 |
59 gaimdistpixdir = $(datadir)/pixmaps/gaim | 60 pidgindistpixdir = $(datadir)/pixmaps/pidgin |
60 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png | 61 pidgindistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png |
61 | 62 |
62 | 63 |
63 distpixmapdir = $(datadir)/pixmaps | 64 distpixmapdir = $(datadir)/pixmaps |
64 distpixmap_DATA = pidgin.png gaim.svg | 65 distpixmap_DATA = pidgin.png pidgin.svg |
65 |