diff options
author | Dave Parks <davep@lindenlab.com> | 2011-07-24 16:19:55 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-07-24 16:19:55 -0500 |
commit | 0ebf271a58ac8c81b7cf764328f2932490adede6 (patch) | |
tree | bad7ae02f86c623f6f44882317dd3bdb97a39b4c | |
parent | 6465218f18cf7d4a7a0df462deb160e00ab5ceb2 (diff) | |
parent | 578e44d9b89012d8d4e1352dfd8a2b56b9d58163 (diff) |
merge
-rw-r--r-- | indra/newview/featuretable.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 67c8b977cf..1f9dc6e4e5 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,6 +1,6 @@ version 32 -// NOTE: This is mostly identical to featuretable_mac.txt with a few differences +// NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table // |