Mercurial > pidgin.yaz
diff pidgin/gtkicon-theme.h @ 32574:4b53d875529f
fixed conflicts in previous merge.
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | 84ab7b2db114 |
children | 4d92a431d0a1 |
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | 84ab7b2db114 |
children | 4d92a431d0a1 |