summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2016-08-19 23:03:37 -0500
committerGary Kramlich <grim@reaperworld.com>2016-08-19 23:03:37 -0500
commitc7b9962bf16de217464db64fe4318f36c8a71566 (patch)
tree0a4f3f57c4561f50ddd62a649835836a14806cf3 /.hgignore
parentcd5969e35b2d75deae9e199b9289baa2096fa5f6 (diff)
parentb1909cbe71f04e3b52f2718101eecf1af24cf289 (diff)
downloadpidgin-c7b9962bf16de217464db64fe4318f36c8a71566.tar.gz
Monster merge everything
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index dd4702683d..85bc7ee76b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,7 @@ pidgin-*
syntax: regexp
(.*/)?TAGS$
(.*/)?\.svn
+.*.swp
.*/?.*\.pc$
.*/?Makefile(\.in)?$
.*/?Makefile\.am\.mingw$
@@ -149,6 +150,8 @@ po/stamp-it
stamp-h1
test-driver
win32-install-dir(\.release)?
+share/ca-certs/cacert.pem
+share/ca-certs/certdata.txt
subinclude:libpurple/protocols/jabber/tests/.hgignore
subinclude:libpurple/protocols/oscar/tests/.hgignore