diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-29 15:17:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-29 15:17:25 -0400 |
| commit | 62a8fec8842a91978b0fad2c24fbf8c14f73f6cd (patch) | |
| tree | dcd76a7bcc85be17348c0010f931cf0237c573d7 | |
| parent | 8d2dea5e9dc6c673299f9b292847617f22e349ab (diff) | |
| parent | 6850f13f50d90d19db2e119ed1596abd1bdd9b36 (diff) | |
merge changes for late release fixes
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -154,6 +154,7 @@ e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start e1ed60913230dd64269a7f7fc52cbc6004f6d52c DRTVWR-71_2.8.0-beta1 e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-beta1 493d9127ee50e84ba08a736a65a23ca86f7a5b01 DRTVWR-70_2.8.0-release +493d9127ee50e84ba08a736a65a23ca86f7a5b01 2.8.0-release 2c7e459e0c883f8e406b932e41e60097e9ee077e DRTVWR-73_2.8.1-beta1 2c7e459e0c883f8e406b932e41e60097e9ee077e 2.8.1-beta1 54bc7823ad4e3a436fef79710f685a7372bbf795 2.8.2-start 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 |