Merge branch 'master' into mapdata-c++
Conflicts:doomsday/client/src/edit_map.cppdoomsday/client/src/map/p_data.cppdoomsday/client/src/map/p_dmu.cppdoomsday/client/src/map/surface.cppdoomsday/libdeng2/include/de/vector.hdoomsday/server/src/server/sv_main.cppdoomsday/server/src/server/sv_pool.cpp
Added by danij over 11 years ago
Added by
Merge branch 'master' into mapdata-c++
Conflicts:
doomsday/client/src/edit_map.cpp
doomsday/client/src/map/p_data.cpp
doomsday/client/src/map/p_dmu.cpp
doomsday/client/src/map/surface.cpp
doomsday/libdeng2/include/de/vector.h
doomsday/server/src/server/sv_main.cpp
doomsday/server/src/server/sv_pool.cpp