summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-04-14 13:22:23 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-04-14 13:22:23 -0700
commit7a6577d60183e4baa9aef7a9238f82c403a681ab (patch)
treed7926948163ae89e1c8fa5a8d838296b20284fb3
parent87524528a1fea00139ed42151a920596a880ae82 (diff)
parent1d8b3d92e24ba01935062e8b6b67b2d65c7173d7 (diff)
Merge with SVN trunk
-rw-r--r--.hgignore34
1 files changed, 34 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000000..38ff57725e
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,34 @@
+syntax: glob
+
+*.pyc
+*~
+.*.swp
+LICENSES
+indra/build-darwin-*
+indra/build-vc[0-9]*
+indra/lib/mono/1.0/*.dll
+indra/lib/mono/indra/*.dll
+indra/lib/mono/indra/*.exe
+indra/lib/mono/indra/*.pdb
+indra/llwindow/glh/glh_linear.h
+indra/newview/app_settings/mozilla
+indra/newview/app_settings/mozilla-runtime-*
+indra/newview/app_settings/mozilla_debug
+indra/newview/app_settings/static_*.db2
+indra/newview/character
+indra/newview/fmod.dll
+indra/newview/mozilla-theme
+indra/newview/mozilla-universal-darwin.tgz
+indra/newview/res-sdl
+indra/newview/skins
+indra/newview/vivox-runtime
+indra/server-linux-*
+indra/test_apps/llmediatest/dependencies/i686-win32
+indra/test_apps/terrain_mule/*.dll
+indra/viewer-linux-*
+indra/web/doc/asset-upload/plugins/lsl_compiler/lslc
+indra/web/doc/asset-upload/plugins/verify-notecard
+indra/web/doc/asset-upload/plugins/verify-texture
+installed.xml
+libraries
+tarfile_tmp