summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2015-01-03 15:58:52 +0100
committerTannin <devnull@localhost>2015-01-03 15:58:52 +0100
commita16e25380f088dc310fbed24d2dcef603357e99a (patch)
tree40fc3b5254f2797eb20bfac1d54a22652d469fa2 /.hgignore
parent459816ab71ae6b350847cc93f1e03e49ecf75ade (diff)
parentf2f9e11fdd876821107cff0c1c5b9d8ecf66691f (diff)
Merge with branch1.2
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index d53a7793..acba45c6 100644
--- a/.hgignore
+++ b/.hgignore
@@ -31,6 +31,9 @@ html
*.log
*.filters
*.lib
+source/organizer/resources/contents/icons
+source/plugins/build-*
+*/GeneratedFiles/*
syntax: regexp
Makefile\.(Debug|Release)
source/.*/debug/.*