summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2015-03-09 12:34:34 +0100
committerTannin <devnull@localhost>2015-03-09 12:34:34 +0100
commit7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch)
treedea71435ac1042cb008fcd9f7b1ec57e6ea91227 /.hgignore
parentd45ebf134819e1559718681becca9c4139fb7151 (diff)
parentdb2954e8eb41da715b9e7d79a72e225797401413 (diff)
Merge with branch1.2
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index c4e01319..0738bd83 100644
--- a/.hgignore
+++ b/.hgignore
@@ -31,7 +31,14 @@ html
*.log
*.filters
*.lib
+source/organizer/resources/contents/icons
+source/plugins/build-*
+*/GeneratedFiles/*
+translations/*
source/LocalPaths.pri
+source/*/Win32/Debug/*
+source/plugins/*/Win32/Debug/*
+*~
syntax: regexp
Makefile\.(Debug|Release)
source/.*/debug/.*