mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-12-26 15:59:50 -05:00
ca27fb06d5
Conflicts: INSTALL.md release-tool src/browser/BrowserOptionDialog.cpp src/browser/BrowserService.cpp src/browser/BrowserService.h src/browser/NativeMessagingBase.h src/browser/NativeMessagingHost.h src/core/Uuid.cpp src/gui/DatabaseTabWidget.cpp src/gui/DatabaseWidget.cpp src/gui/EditWidget.cpp src/gui/MainWindow.cpp src/gui/MainWindow.ui src/proxy/NativeMessagingHost.h src/sshagent/ASN1Key.cpp |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
TemporaryFile.cpp | ||
TemporaryFile.h | ||
TestGui.cpp | ||
TestGui.h | ||
TestGuiPixmaps.cpp | ||
TestGuiPixmaps.h |