CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
513 Commits 10 Branches 30 Tags 34 MiB
f3fffd5259
Commit Graph

2 Commits

Author SHA1 Message Date
Petr Mrázek
aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
 2013-12-10 07:22:22 +01:00
Petr Mrázek
3f5c46a1c4 Finish assets update for 1.7.3 2013-12-10 07:12:52 +01:00