diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
commit | a22bb00530bb779d8e5bb40b68e55767604d88dc (patch) | |
tree | 520019b0c1e8c9cf475d19a60a0322a3c1caea6e /.hgignore | |
parent | 0904cbe4846192c9897267c9a60175f84881f9ed (diff) | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to '.hgignore')
-rw-r--r-- | .hgignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |