diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:10:15 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:10:15 -0700 |
commit | b012a60951f612b9a2c912dd64c00a3b09af5d3f (patch) | |
tree | 7abaf82d1eed4e8cb19458b76325bd2bb4d0ec6d /indra/newview/featuretable_mac.txt | |
parent | baa73fddd9287ddafd2d31551cb253b355ed910a (diff) | |
parent | 85758bdfcf4dc1bdf9845cd4192dc6035acb5795 (diff) |
Merge with trunk
Diffstat (limited to 'indra/newview/featuretable_mac.txt')
-rw-r--r-- | indra/newview/featuretable_mac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index fd2496d8ad..15974c0691 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 19 +version 20 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table |