diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
| commit | 793dde16f371408948474d31f9275ea4031b65aa (patch) | |
| tree | 57d46ee9729c2b1888634ce080ce04d4cc2607f3 /.hgignore | |
| parent | 4f93192e7d00f1f03e0e5241e9f1d2f31623729c (diff) | |
| parent | 352698140775e62498686f80b5aa21aee85524cf (diff) | |
Merge sunshine-internal -> sunshine-experimental
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -10,7 +10,7 @@ syntax: glob .*.swp #OSX image cache file *.DS_Store -*.orig +#*.orig LICENSES indra/.distcc build-linux-* @@ -74,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 |