summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-29 15:17:25 -0400
committerOz Linden <oz@lindenlab.com>2011-07-29 15:17:25 -0400
commit62a8fec8842a91978b0fad2c24fbf8c14f73f6cd (patch)
treedcd76a7bcc85be17348c0010f931cf0237c573d7 /indra
parent8d2dea5e9dc6c673299f9b292847617f22e349ab (diff)
parent6850f13f50d90d19db2e119ed1596abd1bdd9b36 (diff)
merge changes for late release fixes
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/featuretable_mac.txt2
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