Make some corrections.

8 files changed, 8 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index 1bf59953..bb7c5972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 #CLion
-.idea
+.idea/*
+
+# macOS
+.DS_Store
 
 # Clangd
 .cache/
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e09..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 3b7a862c..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-gpg4usb_zh.ts
\ No newline at end of file
diff --git a/.idea/gpg4usb-master.iml b/.idea/gpg4usb-master.iml
deleted file mode 100644
index f08604bb..00000000
--- a/.idea/gpg4usb-master.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 79b3c948..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b51d5f10..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/gpg4usb-master.iml" filepath="$PROJECT_DIR$/.idea/gpg4usb-master.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h
index 014647fb..39bc1b5a 100644
--- a/include/GpgFrontend.h
+++ b/include/GpgFrontend.h
@@ -18,15 +18,15 @@
 
 #define PROJECT_NAME "GpgFrontend"
 #define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Debug"
-#define GIT_VERSION "develop_80f0dcfb8ea78ac64960079f4a95eb3cbeb0af49"
+#define GIT_VERSION "main_1b75d7882b8a1fbd5b61424060c7ac81a1ea9fe4"
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_PATCH 0
 
-#define BUILD_TIMESTAMP "2021-06-19 19:27:52"
+#define BUILD_TIMESTAMP "2021-06-19 19:47:51"
 
-#define GIT_BRANCH_NAME "develop"
-#define GIT_COMMIT_HASH "80f0dcfb8ea78ac64960079f4a95eb3cbeb0af49"
+#define GIT_BRANCH_NAME "main"
+#define GIT_COMMIT_HASH "1b75d7882b8a1fbd5b61424060c7ac81a1ea9fe4"
 
 #endif //GPGFRONTEND_H_IN