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

Conflicts: CMakeLists.txt main.cpp
2013-03-22 14:01:54 +01:00
parent f4c9cb8c1d e4806ab08d
commit cd1fdbbbc2
16 changed files with 523 additions and 84 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -31,7 +31,6 @@ ENDIF()
 # First, include header overrides
 include_directories(hacks)

-
 ######## 3rd Party Libs ########

 # Find the required Qt parts
@ -173,6 +172,7 @@ gui/aboutdialog.h
 gui/consolewindow.h
 gui/instancemodel.h
 gui/instancedelegate.h
+gui/iconcache.h

 multimc_pragma.h

@ -201,6 +201,7 @@ gui/aboutdialog.cpp
 gui/consolewindow.cpp
 gui/instancemodel.cpp
 gui/instancedelegate.cpp
+gui/iconcache.cpp

 java/javautils.cpp
 java/annotations.cpp