MERGE SUMMARY:
Conflicts:
src/QvCoreConfigOperations_Generation.cpp
src/main.cpp
src/ui/w_PrefrencesWindow.cpp
src/ui/w_PrefrencesWindow.h
translations/en-US.ts
It looks like you may be committing a merge.
If this is not correct, please remove the file
.git/MERGE_HEAD
and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch dev
Your branch is up to date with 'origin/dev'.
All conflicts fixed but you are still merging.
Changes to be committed:
new file: .vscode/settings.json
new file: Qv2ray.astylerc
modified: Qv2ray.pro
new file: jePwbM.json
modified: src/Qv2rayBase.h
modified: src/QvConfigUpgrade.cpp
modified: src/QvCoreConfigObjects.h
modified: src/QvCoreConfigOperations.h
modified: src/QvCoreConfigOperations_Convertion.cpp
modified: src/QvCoreConfigOperations_Generation.cpp
modified: src/QvCoreConfigOperations_Verification.cpp
modified: src/QvUtils.cpp
modified: src/QvUtils.h
modified: src/main.cpp
renamed: src/w_ConnectionEditWindow.cpp -> src/ui/w_ConnectionEditWindow.cpp
renamed: src/w_ConnectionEditWindow.h -> src/ui/w_ConnectionEditWindow.h
renamed: src/w_ConnectionEditWindow.ui -> src/ui/w_ConnectionEditWindow.ui
renamed: src/w_ImportConfig.cpp -> src/ui/w_ImportConfig.cpp
renamed: src/w_ImportConfig.h -> src/ui/w_ImportConfig.h
renamed: src/w_ImportConfig.ui -> src/ui/w_ImportConfig.ui
renamed: src/w_MainWindow.cpp -> src/ui/w_MainWindow.cpp
renamed: src/w_MainWindow.h -> src/ui/w_MainWindow.h
renamed: src/w_MainWindow.ui -> src/ui/w_MainWindow.ui
renamed: src/w_PrefrencesWindow.cpp -> src/ui/w_PrefrencesWindow.cpp
renamed: src/w_PrefrencesWindow.h -> src/ui/w_PrefrencesWindow.h
renamed: src/w_PrefrencesWindow.ui -> src/ui/w_PrefrencesWindow.ui
new file: src/ui/w_RouteEditor.cpp
new file: src/ui/w_RouteEditor.h
new file: src/ui/w_RouteEditor.ui
renamed: src/w_SubscribeEditor.cpp -> src/ui/w_SubscribeEditor.cpp
renamed: src/w_SubscribeEditor.h -> src/ui/w_SubscribeEditor.h
renamed: src/w_SubscribeEditor.ui -> src/ui/w_SubscribeEditor.ui
renamed: src/QJsonObjectInsertMacros.h -> src/utils/QJsonObjectInsertMacros.h
new file: src/utils/QPingModel.cpp
new file: src/utils/QPingModel.h
renamed: src/QvHTTPRequestHelper.cpp -> src/utils/QvHTTPRequestHelper.cpp
renamed: src/QvHTTPRequestHelper.h -> src/utils/QvHTTPRequestHelper.h
renamed: src/QvRunguard.cpp -> src/utils/QvRunguard.cpp
renamed: src/QvRunguard.h -> src/utils/QvRunguard.h
renamed: src/QvTinyLog.h -> src/utils/QvTinyLog.h
deleted: src/w_RouteEditor.cpp
deleted: src/w_RouteEditor.h
deleted: src/w_RouteEditor.ui
modified: translations/en-US.ts
Former-commit-id: 348f928acd
