diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-12 11:02:09 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-12 11:02:09 -0800 |
| commit | 6eea54407e76e04ed6417c7f86f5252b26905335 (patch) | |
| tree | 232c2ba9dfb30d483eb7bc814127b049ea4bd4dc | |
| parent | 41f48a16a9e4279eb7805f0ed725b0147305c6ba (diff) | |
| parent | 842bf4d7bb7618f34522e9ee8817b7978229d692 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/render-pipeline/
| -rw-r--r-- | .hgignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -9,6 +9,7 @@ syntax: glob .*.swp #OSX image cache file *.DS_Store +*.orig LICENSES indra/.distcc indra/build-darwin-* |