# # ChangeLog for code/branches/mergeFS18/data/tcl # # Generated by Trac 1.0.9 # Dec 14, 2024, 1:24:00 AM Thu, 28 Feb 2019 11:56:53 GMT merholzl [12194] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/OrxoKart1.oxw (copied) * code/branches/mergeFS18/data/levels/OrxoKart2.oxw (copied) * code/branches/mergeFS18/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw (copied) * code/branches/mergeFS18/data/levels/templates/OrxoKartKart.oxt (copied) * code/branches/mergeFS18/data/overlays/OrxoKartHUD.oxo (copied) * code/branches/mergeFS18/data/tcl/orxokart_highscores.txt (copied) * code/branches/mergeFS18/src/modules/CMakeLists.txt (modified) * code/branches/mergeFS18/src/modules/orxokart (copied) * code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified) Merging OrxoKart Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026] * code/branches/mergeFS18 (copied) new merge branch to cequi 0.8 and ogre 1.9 Tue, 20 Feb 2018 20:23:01 GMT landauf [11787] * code/branches/cegui0.8_ogre1.9 (copied) created new branch to merge cegui0.8 and ogre1.9 with the recent ...