diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
| commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
| tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /.hgignore | |
| parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,7 @@ indra/newview/fmod.dll indra/newview/mozilla-theme indra/newview/mozilla-universal-darwin.tgz indra/newview/res/ll_icon.* -indra/newview/res-sdl +indra/newview/res-sdl/ll_icon.* indra/newview/vivox-runtime indra/server-linux-* indra/temp |