summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-10 10:33:13 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-10 10:33:13 -0700
commitb253069f7e2a99e529caff0319fbcffc77cd5b8d (patch)
tree7cf7c352e497a1d79072e7b737db1af8f2483296 /.hgignore
parenta997e131d4262f0a18a6f4f8c305c73edbfea6b6 (diff)
parentbe7ac8bbfe991427636656ec1679b8119c9d9dbe (diff)
Automated merge with http://hg.lindenlab.com/viewer/viewer-20/
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 61c38705f4..15fb913653 100644
--- a/.hgignore
+++ b/.hgignore
@@ -24,6 +24,7 @@ indra/newview/res-sdl
indra/newview/skins
indra/newview/vivox-runtime
indra/server-linux-*
+indra/test/linden_file.dat
indra/test_apps/llmediatest/dependencies/i686-win32
indra/test_apps/terrain_mule/*.dll
indra/viewer-linux-*