diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
| commit | 8c04829110028c951d05470d54de5bf3708ff773 (patch) | |
| tree | 6a7895d2b67f092275de99414a73e7bad68701bf | |
| parent | b75528fde663413e9c2a4be2975e014771fb562f (diff) | |
STORM-1126 WIP Windlight Estate Settings integration: pass 10
Eliminated more merge artifacts.
| -rw-r--r-- | indra/newview/featuretable.txt | 2 | ||||
| -rw-r--r-- | indra/newview/featuretable_linux.txt | 2 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 173e81733c..721fe81a3c 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 24 +version 23 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 602f62cf69..1bad7e5260 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,4 @@ -version 23 +version 22 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index bbe63be5ae..4fba47e3df 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 23 +version 22 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table |