Merge up to current viewer/viewer-20
commit
16ac0ec91d
81
.hgignore
81
.hgignore
|
|
@ -1,39 +1,44 @@
|
|||
syntax: glob
|
||||
|
||||
*.pyc
|
||||
*~
|
||||
.*.swp
|
||||
LICENSES
|
||||
indra/.distcc
|
||||
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/lib/python/eventlet/
|
||||
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/linden_file.dat
|
||||
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
|
||||
^indra/lib/python/eventlet.*
|
||||
syntax: glob
|
||||
|
||||
*.pyc
|
||||
*~
|
||||
.*.swp
|
||||
LICENSES
|
||||
indra/.distcc
|
||||
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/lib/python/eventlet/
|
||||
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/linden_file.dat
|
||||
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
|
||||
^indra/lib/python/mulib.*
|
||||
^web/locale.*
|
||||
^web/secondlife.com.*
|
||||
^web/config.*
|
||||
^indra/web/dataservice/locale.*
|
||||
^indra/web/dataservice/lib/shared/vault.*
|
||||
^indra/web/dataservice/vendor.*
|
||||
|
|
|
|||
Loading…
Reference in New Issue