0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
7dfd6aa051c582e26125e17e1d6eed5e675e1027
pollymc/gui/MainWindow.cpp
Petr Mrázek acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools 
Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.
2014-02-25 01:52:58 +01:00

44 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink