mirror/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-04-19 08:46:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
1936bd181f57a554ce0dd757ffe9419100eb47f4
PrismLauncher/gui/dialogs/OneSixModEditDialog.cpp
Petr Mrázek 1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances 
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
2014-02-01 19:37:16 +01:00

9.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink