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
10960
for
code/branches/presentationHS15/src/modules/hover/TimeHUD.cc
Timestamp:
Dec 9, 2015, 12:47:30 PM (
9 years
ago)
Author:
maxima
Message:
Merged presentation and hover branches. Hover minigame works fine.
Location:
code/branches/presentationHS15
Files:
1 edited
2 copied
.
(modified)
(
1 prop
)
src/modules/hover
(copied)
(copied from
code/branches/hoverHS15/src/modules/hover
)
src/modules/hover/TimeHUD.cc
(copied)
(copied from
code/branches/hoverHS15/src/modules/hover/TimeHUD.cc
)
code/branches/presentationHS15
Property
svn:mergeinfo
changed
/code/branches/hoverHS15
(added)
merged:
10633-10636,10638,10643,10656-10662,10664-10665,10668,10694,10697,10700,10708,10751,10760,10784-10785,10787,10835,10893-10895,10900,10926,10928-10930,10938,10940,10943,10947,10952
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive