aboutsummaryrefslogtreecommitdiff
path: root/depends/classparser/include
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-11-06 17:02:23 +0000
committerSky <git@bunnies.cc>2013-11-06 17:02:23 +0000
commit7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch)
tree2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /depends/classparser/include
parentdc3b0fcb2b74aeede37b08216b203cab284f7fce (diff)
parentbba4ed5ab2c98c3d60a141d6a089a49716753615 (diff)
downloadPrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz
PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.bz2
PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip
Merge branch 'develop'
Diffstat (limited to 'depends/classparser/include')
-rw-r--r--depends/classparser/include/classparser_config.h5
-rw-r--r--depends/classparser/include/javautils.h8
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);
}