diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-20 11:40:11 -0800 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-20 11:40:11 -0800 |
commit | 280a321867d02c5c139a974dfc89035ffb8dfcd6 (patch) | |
tree | 90690d0728473a89d1679cda93e0a309d2388cc8 /.hgignore | |
parent | 75138ddfb27416b8740df35fcc0eb6ed3643452f (diff) | |
parent | 172cba3c42027c5abc277e571dcd18b6fcc5fe8c (diff) |
Merge
--HG--
branch : product-engine
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 |