diff options
author | Gary Kramlich <grim@reaperworld.com> | 2017-03-10 20:36:55 -0600 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2017-03-10 20:36:55 -0600 |
commit | b242ac8450557efc509a9bd43820e873762f60b7 (patch) | |
tree | 1f9905093b1c810b3b957da6b128d7c558b99541 /.hgignore | |
parent | 3de506717e24a62d1bde3506c18b4b540335d73a (diff) | |
parent | b3bb679990b381823062eac41b7234df96950e59 (diff) | |
download | pidgin-b242ac8450557efc509a9bd43820e873762f60b7.tar.gz |
Merge 2.12.0 into default
Diffstat (limited to '.hgignore')
-rw-r--r-- | .hgignore | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -3,7 +3,7 @@ syntax: glob clang_output_* pidgin-* .dirstamp - +.DS_Store syntax: regexp (.*/)?TAGS$ (.*/)?\.svn @@ -159,4 +159,3 @@ subinclude:libpurple/protocols/jabber/tests/.hgignore subinclude:libpurple/protocols/oscar/tests/.hgignore subinclude:libpurple/protocols/yahoo/tests/.hgignore subinclude:libpurple/tests/.hgignore - |