Merge branch 'master' of http://github.com/peterix/MultiMC5

Browse Source

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp

...

This commit is contained in:

Orochimarufan

2013-02-21 20:40:32 +01:00

parent 576e979df4 50d1f62bf4

commit ca1fd44637

55 changed files with 1978 additions and 992 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

resources/icons/MultiMC.ico Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 74 KiB