Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3790 in orxonox.OLD for orxonox/trunk/ChangeLog


Ignore:
Timestamp:
Apr 13, 2005, 12:33:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/ChangeLog

    r3601 r3790  
     12005-03-31      Benjamin Grauer <bensch@orxonox.ethz.ch>
     2        Added Text Engine
     3
     42005-03-26      Benjamin Grauer <bensch@orxonox.ethz.ch>
     5        Added ResourceManager
     6
     72005-03-24      Patrick Boenzli <patrick@orxonox.ethz.ch>
     8        Reimplemented shooting.
     9
    1102005-03-16      orxonox
    211        Finished work on version 0.2.1-pre-alpha released 0.2.2-pre-alpha
Note: See TracChangeset for help on using the changeset viewer.