Merge branch 'develop' into feature_badges

Conflicts: logic/OneSixInstance.cpp
2014-03-10 19:24:29 +01:00
parent 73fc9c79cf d11f10ea1e
commit fcc5bc2ce0
40 changed files with 2683 additions and 1758 deletions
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@ -190,6 +190,8 @@ public:

 	bool canLaunch() const;

+	virtual bool reload();
+
 signals:
 	/*!
 	 * \brief Signal emitted when properties relevant to the instance view change