From 6113f7fb9798b4ba74f6448234bfdb73a2e30719 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 24 Feb 2012 16:59:28 -0800
Subject: ignore *.rej files generated by patch

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.hgignore')

diff --git a/.hgignore b/.hgignore
index 403b73df6d..bc3020eee4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -67,3 +67,4 @@ glob:indra/newview/filters.xml
 glob:indra/newview/avatar_icons_cache.txt
 glob:indra/newview/avatar_lad.log
 glob:*.diff
+*.rej
-- 
cgit v1.2.3


From 447f1ff12057c15c2f38e6b5d07849b00f84c25c Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 20 Mar 2012 23:58:16 +0000
Subject: trivial change to test push

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.hgignore')

diff --git a/.hgignore b/.hgignore
index 403b73df6d..94391e11ab 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
 syntax: glob
 
+
 # WinMerge temp files
 *.bak
 # Compiled python bytecode
-- 
cgit v1.2.3