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
8285
for
code/branches/kicklib2/data/mac
Timestamp:
Apr 21, 2011, 7:43:10 PM (
14 years
ago)
Author:
rgrieder
Message:
Merged revisions 8098 - 8277 from kicklib to kicklib2.
Location:
code/branches/kicklib2
Files:
1 edited
9 copied
.
(modified)
(
1 prop
)
data/mac
(copied)
(copied from
code/branches/kicklib/data/mac
)
data/mac/English.lproj
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj
)
data/mac/English.lproj/InfoPlist.strings
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj/InfoPlist.strings
)
data/mac/English.lproj/MainMenu.nib
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj/MainMenu.nib
)
data/mac/English.lproj/MainMenu.nib/designable.nib
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/designable.nib
)
data/mac/English.lproj/MainMenu.nib/keyedobjects.nib
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib
)
data/mac/English.lproj/MainMenu.xib
(copied)
(copied from
code/branches/kicklib/data/mac/English.lproj/MainMenu.xib
)
data/mac/Icon.icns
(copied)
(copied from
code/branches/kicklib/data/mac/Icon.icns
)
data/mac/Orxonox-Info.plist
(copied)
(copied from
code/branches/kicklib/data/mac/Orxonox-Info.plist
)
code/branches/kicklib2
Property
svn:mergeinfo
changed
/code/branches/kicklib
merged:
8098,8103,8111-8113,8118-8124,8126,8129-8132,8134,8176,8216-8218,8221-8222,8224-8225,8230-8231,8233,8268-8274,8277
/code/branches/mac_osx
merged:
8083-8084,8090-8092,8114,8116,8125,8127-8128,8135
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive