0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
81 Commits 1 Branch 0 Tags 29 MiB
23474da175
Commit Graph

1 Commits

Author SHA1 Message Date
Orochimarufan
ca1fd44637 Merge branch 'master' of http://github.com/peterix/MultiMC5 
Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp
 2013-02-21 20:40:32 +01:00