Merge 0.10->trunk

[prosody.git] / .hgignore

diff --git a/.hgignore b/.hgignore
index b7f3c20ce2d65d163e93cbd63d6fa161a5df9fbe..7937da24a01f68ddd7440f437033b278be5a0683 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -6,8 +6,10 @@ www_files
 html/*
 prosody.lua
 prosody.cfg.lua
+prosody.version
 config.unix
 *.patch
+*.diff
 *.orig
 *.rej
 *.save
@@ -20,3 +22,7 @@ config.unix
 *.log
 *.err
 *.debug
+*.dll
+*.exp
+*.lib
+*.obj