diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
| commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
| tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /.hgignore | |
| parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
| parent | a4966a661213a25b780604084fe169565f62f548 (diff) | |
merge up to latest snowstorm integration branch
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 |