mirror/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-04-20 01:06:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
47bc7e5ee377dacfeb7cf3d13f07cfd24db906fb
PrismLauncher/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