Project

General

Profile

« Previous | Next » 

Revision 1e97297b

Added by skyjake almost 4 years ago

Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into stable

  1. Conflicts:
  2. doomsday/apps/client/net.dengine.client.pack/Info
  3. doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info
  4. doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info
  5. doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
  6. doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings
  7. doomsday/apps/client/src/clientapp.cpp
  8. doomsday/apps/client/src/render/modelrenderer.cpp
  9. doomsday/apps/client/src/world/base/bindings_world.cpp
  10. doomsday/apps/libdoomsday/net.dengine.base.pack/Info
  11. doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp
  12. doomsday/apps/libdoomsday/src/gameprofiles.cpp
  13. doomsday/apps/plugins/common/src/common.cpp
  14. doomsday/cmake/Macros.cmake
  15. doomsday/cmake/Version.cmake
  16. doomsday/sdk-qch.doxy
  17. doomsday/sdk/libcore/net.dengine.stdlib.pack/Info
  18. doomsday/sdk/libgui/net.dengine.stdlib.gui.pack/Info
  19. doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings

Files

  • added
  • modified
  • copied
  • renamed
  • deleted