diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-06 18:31:52 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-06 18:31:52 -0500 |
| commit | 9c048d12fdd9fd9c95cc93223fc731ee7b548294 (patch) | |
| tree | 4d6e91028b4ab48b6600c34f9cf126610fbce690 /.hgignore | |
| parent | 2aa981ac23bbdf2fd609e04434179be0cfec79ce (diff) | |
| parent | f3bbcfb9d41b41f8c4b144ae9a1173fc7719b88c (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -29,7 +29,6 @@ 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 @@ -50,3 +49,7 @@ tarfile_tmp ^indra/web/dataservice/lib/shared/vault.* ^indra/web/dataservice/vendor.* glob:indra/newview/dbghelp.dll +glob:*.cpp.orig +glob:*.cpp.bak +glob:*.h.bak +glob:*.h.orig |