Merge branch 'dev' of github.com:wh201906/Proxmark3GUI into dev

just for sync

.gitignore

@@ -1,73 +1,73 @@
-# This file is used to ignore files which are generated
+# This file is used to ignore files which are generated
-# ----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-
+
-*~
+*~
-*.autosave
+*.autosave
-*.a
+*.a
-*.core
+*.core
-*.moc
+*.moc
-*.o
+*.o
-*.obj
+*.obj
-*.orig
+*.orig
-*.rej
+*.rej
-*.so
+*.so
-*.so.*
+*.so.*
-*_pch.h.cpp
+*_pch.h.cpp
-*_resource.rc
+*_resource.rc
-*.qm
+*.qm
-.#*
+.#*
-*.*#
+*.*#
-core
+core
-!core/
+!core/
-tags
+tags
-.DS_Store
+.DS_Store
-.directory
+.directory
-*.debug
+*.debug
-Makefile*
+Makefile*
-*.prl
+*.prl
-*.app
+*.app
-moc_*.cpp
+moc_*.cpp
-ui_*.h
+ui_*.h
-qrc_*.cpp
+qrc_*.cpp
-Thumbs.db
+Thumbs.db
-*.res
+*.res
-*.rc
+*.rc
-/.qmake.cache
+/.qmake.cache
-/.qmake.stash
+/.qmake.stash
-
+
-# qtcreator generated files
+# qtcreator generated files
-*.pro.user*
+*.pro.user*
-
+
-# xemacs temporary files
+# xemacs temporary files
-*.flc
+*.flc
-
+
-# Vim temporary files
+# Vim temporary files
-.*.swp
+.*.swp
-
+
-# Visual Studio generated files
+# Visual Studio generated files
-*.ib_pdb_index
+*.ib_pdb_index
-*.idb
+*.idb
-*.ilk
+*.ilk
-*.pdb
+*.pdb
-*.sln
+*.sln
-*.suo
+*.suo
-*.vcproj
+*.vcproj
-*vcproj.*.*.user
+*vcproj.*.*.user
-*.ncb
+*.ncb
-*.sdf
+*.sdf
-*.opensdf
+*.opensdf
-*.vcxproj
+*.vcxproj
-*vcxproj.*
+*vcxproj.*
-
+
-# MinGW generated files
+# MinGW generated files
-*.Debug
+*.Debug
-*.Release
+*.Release
-
+
-# Python byte code
+# Python byte code
-*.pyc
+*.pyc
-
+
-# Binaries
+# Binaries
-# --------
+# --------
-*.dll
+*.dll
-*.exe
+*.exe
-
+

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 wh201906
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

main.cpp

@@ -1,11 +1,11 @@
-#include "mainwindow.h"
+#include "mainwindow.h"
-
+
-#include <QApplication>
+#include <QApplication>
-
+
-int main(int argc, char *argv[])
+int main(int argc, char *argv[])
-{
+{
-    QApplication a(argc, argv);
+    QApplication a(argc, argv);
-    MainWindow w;
+    MainWindow w;
-    w.show();
+    w.show();
-    return a.exec();
+    return a.exec();
-}
+}