Mercurial > pidgin.yaz
diff pidgin/pixmaps/Makefile.am @ 15928:5b065c7ff5cd
merge of '04076a446ca2bc48c37d00b8b255bc1311b6c51c'
and '8a20c90142cacba36041509da3a0e11499df3ebc'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Mon, 26 Mar 2007 01:55:33 +0000 |
parents | f771cdcc551a b4086a92568f |
children | 9ac4e6b097d3 |
line wrap: on
line diff
--- a/pidgin/pixmaps/Makefile.am Mon Mar 26 01:11:46 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Mon Mar 26 01:55:33 2007 +0000 @@ -9,8 +9,8 @@ connect.png \ edit.png \ pidgin.png \ - gaim.svg \ - info.png \ + pidgin.svg \ + info.png \ insert-image.png \ insert-image-small.png \ insert-link-small.png \ @@ -23,7 +23,7 @@ pause.png \ phone.png \ send-im.png \ - status-online.png \ + status-online.png \ status-offline.png \ status-away.png \ status-invisible.png \ @@ -46,20 +46,23 @@ text_smaller.png \ typed.png \ typing.png \ + window-icon.png \ Makefile.mingw \ - gaim.ico + pidgin.ico -gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons -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 +pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons +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 -gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons -gaimiconpix_DATA = window-icon.png +pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons +pidginiconpix_DATA = window-icon.png -gaimdistpixdir = $(datadir)/pixmaps/gaim -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 +pidgindistpixdir = $(datadir)/pixmaps/pidgin +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 distpixmapdir = $(datadir)/pixmaps -distpixmap_DATA = pidgin.png gaim.svg +distpixmap_DATA = pidgin.png pidgin.svg + +