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

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp

1 files changed, 17 insertions, 0 deletions

diff --git a/libutil/include/userutils.h b/libutil/include/userutils.h
new file mode 100644
index 00000000..c99e758e
--- /dev/null
+++ b/libutil/include/userutils.h
@@ -0,0 +1,17 @@
+#ifndef USERUTILS_H
+#define USERUTILS_H
+
+#include <QString>
+
+namespace Util
+{
+    // Get the Directory representing the User's Desktop
+    QString getDesktopDir();
+
+    // Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
+    // call it *name* and assign it the icon *icon*
+    // return true if operation succeeded
+    bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+}
+
+#endif // USERUTILS_H