diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
| commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
| tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /.hgignore | |
| parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
| parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) | |
Merge. Refresh from viewer-release merged with in-progress work.
Diffstat (limited to '.hgignore')
| -rwxr-xr-x[-rw-r--r--] | .hgignore | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.hgignore b/.hgignore index b180d92003..c845758e7c 100644..100755 --- a/.hgignore +++ b/.hgignore @@ -10,7 +10,7 @@ syntax: glob .*.swp #OSX image cache file *.DS_Store -*.orig +#*.orig LICENSES indra/.distcc build-linux-* @@ -50,6 +50,11 @@ indra/web/doc/asset-upload/plugins/verify-texture installed.xml libraries tarfile_tmp +debian/secondlife-viewer* +debian/secondlife-appearance-utility* +debian/files +build-stamp +configure-stamp ^indra/lib/python/mulib.* ^web/locale.* ^web/secondlife.com.* @@ -69,4 +74,4 @@ glob:indra/newview/filters.xml glob:indra/newview/avatar_icons_cache.txt glob:indra/newview/avatar_lad.log glob:*.diff -*.rej +#*.rej |