diff options
| author | Ankit Vani <a@nevitus.org> | 2014-11-26 16:01:25 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2014-11-26 16:01:25 +0530 |
| commit | 56ee5b37dbab76c72cbef4ea5ff110df813f6f6a (patch) | |
| tree | 37373eff45a74c30d3ab7f1796f57a16783dacaf /.hgignore | |
| parent | 9248bd48faafc676f05c6d3a1decc49c39897f5f (diff) | |
| parent | 87ad5244b36acd3e2a5ea9625869779b93dadf4d (diff) | |
| download | pidgin-56ee5b37dbab76c72cbef4ea5ff110df813f6f6a.tar.gz | |
Merged default branch
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -75,7 +75,7 @@ libpurple/dbus-signals.c libpurple/dbus-types.[ch] libpurple/enums.[ch] libpurple/example/nullclient -libpurple/gconf/purple.schemas$ +libpurple/data/gconf/purple.schemas$ libpurple/marshallers.[ch] libpurple/plugins/dbus-example-bindings.c libpurple/plugins/perl/common/Makefile.PL$ @@ -113,10 +113,11 @@ pidgin-.*.tar.bz2 pidgin-.*.tar.gz pidgin-[0-9a-z.-]+/ pidgin.apspec$ -pidgin.desktop$ -pidgin.desktop.in$ pidgin/.*\.html\.h$ pidgin/pidgin$ +pidgin/data/pidgin.appdata.xml$ +pidgin/data/pidgin.desktop$ +pidgin/data/pidgin.desktop.in$ pidgin/pixmaps/emotes/default/24/theme pidgin/pixmaps/emotes/none/theme pidgin/pixmaps/emotes/small/16/theme |