summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-11-23 15:53:19 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-11-23 15:53:19 +0200
commit25085a67f4baf341f1ebc26d7ba21e294ec56302 (patch)
tree296235a869f73af24b274dd42cc07fcf31d1ce19 /.hgignore
parent9f0dbcf4c0c6c8621c377fd7f9e417aa76acd836 (diff)
parentd2cee29e8a039e3cac5c851b4e770b9c7e1095f0 (diff)
Merge
--HG-- branch : product-engine
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 4d98acf5d9..886af2b007 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,6 +13,7 @@ LICENSES
indra/.distcc
indra/build-darwin-*
indra/build-vc[0-9]*
+indra/CMakeFiles
indra/lib/mono/1.0/*.dll
indra/lib/mono/indra/*.dll
indra/lib/mono/indra/*.exe
@@ -31,6 +32,7 @@ indra/newview/mozilla-universal-darwin.tgz
indra/newview/res-sdl
indra/newview/vivox-runtime
indra/server-linux-*
+indra/temp
indra/test/linden_file.dat
indra/test_apps/llmediatest/dependencies/i686-win32
indra/test_apps/terrain_mule/*.dll