diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-20 20:02:42 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-20 20:02:42 +0000 |
| commit | 2bf0c1af3b7d375c1e7facc0eba919b85cd427c8 (patch) | |
| tree | 7bad7e39dd47e23afd4cba32492495e7beddd2f9 /.hgignore | |
| parent | f80b5ea3612fec02c9ed37e736774bde5ff43703 (diff) | |
| parent | 172cba3c42027c5abc277e571dcd18b6fcc5fe8c (diff) | |
merge the heads. =.=
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 |