From 8ed056fde9fe5fc9755158013a5cb8be73066e2c Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Sat, 20 Jun 2009 09:17:56 +0000 Subject: 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 --- indra/newview/featuretable_mac.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/featuretable_mac.txt') 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 -- cgit v1.2.3