- Timestamp:
- Nov 25, 2009, 4:52:37 PM (15 years ago)
-
merged menu branch to presentation2 branch with some additional fixes and features
- Location:
- code/branches/presentation2
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
data/gui/layouts/QuestGUI.layout (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2
- Property svn:mergeinfo changed
/code/branches/ingamemenu (added) merged: 6003,6018-6020,6022-6023 /code/branches/menu (added) merged: 5941,5944,5952,6024,6032,6036,6047-6049,6051,6145-6146,6148
- Property svn:mergeinfo changed
-
code/branches/presentation2/data/gui/layouts/QuestGUI.layout
r5781 r6150 6 6 <Property Name="FrameEnabled" Value="set:true"/> 7 7 <Property Name="BackgroundEnabled" Value="set:false"/> 8 <Property Name="InheritsAlpha" Value="False" /> 8 9 9 10 <Window Type="TaharezLook/Titlebar" Name="orxonox/QuestGUI/Title">
Note: See TracChangeset
for help on using the changeset viewer.
