External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-14 12:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature_badges

Browse Source 
Conflicts:
	logic/OneSixInstance.cpp
This commit is contained in:
Jan Dalheimer
2014-03-10 19:24:29 +01:00
parent 73fc9c79cf d11f10ea1e
commit fcc5bc2ce0
40 changed files with 2683 additions and 1758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/BaseInstance.h
View File

@@ -190,6 +190,8 @@ public:
bool canLaunch() const;
virtual bool reload();
signals:
/*!
* \brief Signal emitted when properties relevant to the instance view change