Merge.

[irc/quakenet/qwebirc.git] / .hgignore

diff --git a/.hgignore b/.hgignore
index 95ab0662c5427ea1ac784d1f48b6b6e7479c4a54..0c07dce5a9311f8b6461ef0939ea5091021a3af7 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,9 @@
 syntax: glob
-static/js/{ugly,swm,mocha}ui.js
+static/js/{ugly,swm,mocha,q}ui{,-*}.js
 static/js/qwebirc.js
-static/js/debug
+static/{js,css}/debug
+static/css
+static/panes/privacypolicy.html
 config.py
 dropin.cache
 *.tap
@@ -11,4 +13,11 @@ dropin.cache
 defargs.conf
 Thumbs.db
 [dD]esktop.ini
-static/js/mochaui/mocha-compressed.js
\ No newline at end of file
+static/{ugly,swm,mocha,q}ui{,debug}.html
+{bin/,}.checked
+{bin/,}.compiled
+ssl
+screenlog*
+syslog.py
+run.sh
+