summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-20 17:38:42 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-20 17:38:42 -0800
commit017b989de4f0c0c5ba29d7efa5f0677a80c25875 (patch)
tree7b137758e21dd0350c12d34417ad63adad62e107 /.hgignore
parentc9101f603a7969f4d46a7d8d911fa8805d926548 (diff)
parent280a321867d02c5c139a974dfc89035ffb8dfcd6 (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