From 116f5c7880ceead16133d51693adc1ca25564049 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 2 Nov 2009 10:01:47 -0800 Subject: added ignores for winmerge cruft --- .hgignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.hgignore') diff --git a/.hgignore b/.hgignore index 8e02212e79..6357f0afd7 100644 --- a/.hgignore +++ b/.hgignore @@ -44,3 +44,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 -- cgit v1.2.3 From 22e6c3f952428750e68d08ed8788be37f20498a1 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Tue, 3 Nov 2009 11:45:54 -0500 Subject: Added .DS_Store to .hgignore and removed the checked in version from the repos. It's an OSX image cache file that was accidentally added to the repos. -Reviewed by brad. --- .hgignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.hgignore') diff --git a/.hgignore b/.hgignore index 454be00dbf..cff2a14b94 100644 --- a/.hgignore +++ b/.hgignore @@ -7,6 +7,8 @@ syntax: glob # Emacs temp files *~ .*.swp +#OSX image cache file +*.DS_Store LICENSES indra/.distcc indra/build-darwin-* -- cgit v1.2.3