diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2017-06-19 21:54:28 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2017-06-19 21:54:28 -0400 |
| commit | 76a1ae439ec11e3fa3a9e2423f7b0c9ce053f6af (patch) | |
| tree | cd7749d2a93473a66af5998e9c8315d46387ce8c /.hgignore | |
| parent | 722a98fe7a3d0cacd84d3c0469b11a84f4b904f5 (diff) | |
| parent | b48616c164f1deaeea8e920bd65d5bc467f2b107 (diff) | |
| download | pidgin-76a1ae439ec11e3fa3a9e2423f7b0c9ce053f6af.tar.gz | |
Merge with default.
For meson build, delete marshallers and update name of resource file.
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -64,7 +64,6 @@ doc/reference/.*/html/.* doc/reference/.*/xml/.* doc/reference/.*/version.xml finch/finch$ -finch/libgnt/gntmarshal.[ch] gtk-doc.make install-sh intltool-.* @@ -75,9 +74,7 @@ libpurple/enums.[ch] libpurple/example/nullclient libpurple/data/purple-url-handler.desktop$ libpurple/data/purple-url-handler.desktop.in$ -libpurple/marshallers.[ch] libpurple/plugins/dbus-example-bindings.c -libpurple/protocols/facebook/marshal.[ch] libpurple/purple-client-bindings.ch libpurple/purple-client-bindings.h libpurple/purple-client-example |