You need to sign in or sign up before continuing.
-
Jeff Biggs authored
Conflicts: CMakeLists.txt src/Main/fg_init.cxx src/Main/globals.cxx src/Scenery/scenery.cxx src/Scenery/tilemgr.cxx
49e39837
Conflicts: CMakeLists.txt src/Main/fg_init.cxx src/Main/globals.cxx src/Scenery/scenery.cxx src/Scenery/tilemgr.cxx