diff options
author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/featuretable_mac.txt | |
parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) |
Automated merge with file:///e:\code\viewer-experience
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 fa67ee547c..2690e8ec70 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 29 +version 30 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table |