mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-03-11 08:54:48 +00:00
Conflicts: src/CMakeLists.txt src/autotype/xcb/AutoTypeXCB.cpp src/browser/BrowserAction.cpp src/browser/BrowserService.cpp src/browser/BrowserService.h src/browser/BrowserSettings.h src/browser/NativeMessagingHost.cpp src/browser/NativeMessagingHost.h src/gui/EditWidgetIcons.cpp src/gui/EditWidgetIcons.h src/gui/MainWindow.cpp src/proxy/NativeMessagingHost.cpp tests/TestOpenSSHKey.cpp |
||
|---|---|---|
| .. | ||
| AgentSettingsPage.cpp | ||
| AgentSettingsPage.h | ||
| AgentSettingsWidget.cpp | ||
| AgentSettingsWidget.h | ||
| AgentSettingsWidget.ui | ||
| ASN1Key.cpp | ||
| ASN1Key.h | ||
| bcrypt_pbkdf.cpp | ||
| BinaryStream.cpp | ||
| BinaryStream.h | ||
| blf.h | ||
| blowfish.c | ||
| CMakeLists.txt | ||
| includes.h | ||
| KeeAgentSettings.cpp | ||
| KeeAgentSettings.h | ||
| OpenSSHKey.cpp | ||
| OpenSSHKey.h | ||
| SSHAgent.cpp | ||
| SSHAgent.h | ||