Search:
Login
Preferences
Lost Password?
Help/Guide
Wiki
Home
Index
Recent Changes
Tickets
Reports
Query
New Ticket
Defect
Enhancement
Feature
Task
Recent Changes
Code
Browse
Recent Changes
Timeline
Roadmap
Doxygen
Jenkins
Mail
Search
Context Navigation
←
Previous Change
Next Change
→
Changeset
9526
for
code/trunk/data/levels/includes/weaponSettingsbigship.oxi
Timestamp:
Feb 19, 2013, 10:25:42 AM (
12 years
ago)
Author:
jo
Message:
Merging presentationHS12 back to the trunk.
Location:
code/trunk
Files:
1 edited
1 copied
.
(modified)
(
1 prop
)
data/levels/includes/weaponSettingsbigship.oxi
(copied)
(copied from
code/branches/presentationHS12/data/levels/includes/weaponSettingsbigship.oxi
)
code/trunk
Property
svn:mergeinfo
changed
/code/branches/Racingbot
(added)
merged:
9388,9399,9412,9432,9436,9441,9451,9459,9470,9487,9490,9507-9508,9512-9513
/code/branches/largeShip1
(added)
merged:
9384,9454-9455,9515
/code/branches/presentationHS12
(added)
merged:
9481,9483,9494,9498,9501,9503,9505,9516,9518-9521,9523,9525
/code/branches/spaceNavigation
(added)
merged:
9381,9400,9421,9429,9434-9435,9443-9444,9450,9457,9468,9471-9472,9484,9486,9495-9496
/code/branches/turret
(added)
merged:
9380,9460,9469,9489,9497,9499
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive