From 8c04829110028c951d05470d54de5bf3708ff773 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 31 Mar 2011 18:24:01 +0300 Subject: STORM-1126 WIP Windlight Estate Settings integration: pass 10 Eliminated more merge artifacts. --- indra/newview/featuretable.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/featuretable.txt') 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 -- cgit v1.2.3