diff options
| author | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
| commit | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch) | |
| tree | 7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /depends/classparser/include | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff) | |
| download | PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.bz2 PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'depends/classparser/include')
| -rw-r--r-- | depends/classparser/include/classparser_config.h | 5 | ||||
| -rw-r--r-- | depends/classparser/include/javautils.h | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/depends/classparser/include/classparser_config.h b/depends/classparser/include/classparser_config.h index fe6a2ab9..a043824a 100644 --- a/depends/classparser/include/classparser_config.h +++ b/depends/classparser/include/classparser_config.h @@ -16,8 +16,7 @@ #include <QtCore/QtGlobal> #ifdef CLASSPARSER_LIBRARY -# define CLASSPARSER_EXPORT Q_DECL_EXPORT +#define CLASSPARSER_EXPORT Q_DECL_EXPORT #else -# define CLASSPARSER_EXPORT Q_DECL_IMPORT +#define CLASSPARSER_EXPORT Q_DECL_IMPORT #endif - diff --git a/depends/classparser/include/javautils.h b/depends/classparser/include/javautils.h index 63e5ec26..90042261 100644 --- a/depends/classparser/include/javautils.h +++ b/depends/classparser/include/javautils.h @@ -22,8 +22,8 @@ namespace javautils { - /** - * @brief Get the version from a minecraft.jar by parsing its class files. Expensive! - */ - QString GetMinecraftJarVersion(QString jar); +/** + * @brief Get the version from a minecraft.jar by parsing its class files. Expensive! + */ +QString GetMinecraftJarVersion(QString jar); } |