Commits

Scott Lawrence committed 4289ba0 Merge

merge changes for late release fixes

  • Participants
  • Parent commits f1f7875, 93b7b1d

Comments (0)

Files changed (3)

 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

indra/newview/app_settings/settings.xml

File contents unchanged.

indra/newview/featuretable_mac.txt

-version 29
+version 30
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table