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
6524
for
code/trunk/data/levels/templates/pickup_representation_templates.oxt
Timestamp:
Mar 15, 2010, 3:27:09 PM (
14 years
ago)
Author:
dafrick
Message:
Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, very soon.
Location:
code/trunk
Files:
1 edited
1 copied
.
(modified)
(
1 prop
)
data/levels/templates/pickup_representation_templates.oxt
(copied)
(copied from
code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt
)
code/trunk
Property
svn:mergeinfo
changed
/code/branches/pickup2
(added)
merged:
5942,5947,5953,6405
/code/branches/pickup3
(added)
merged:
6418-6421,6466-6467,6474-6475,6477-6480,6484-6486,6489-6490,6492,6496-6499,6512,6514-6521,6523
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive