summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable_linux.txt
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-06-20 09:17:56 +0000
committerAdam Moss <moss@lindenlab.com>2009-06-20 09:17:56 +0000
commit8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch)
treed7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/newview/featuretable_linux.txt
parent351ebe9fcb76f3b99c2957004bb8493a904869ee (diff)
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'indra/newview/featuretable_linux.txt')
-rw-r--r--indra/newview/featuretable_linux.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 09105b8d88..57d712ede7 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.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