Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-15 17:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
b4d806ad41
keepassxc/src/proxy
History
Jonathan White aae6d09fd3
Merge branch 'master' into develop 
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
2018-05-07 23:24:30 -04:00
..
CMakeLists.txt Fix Windows build with socket size 2018-04-27 15:28:12 -04:00
keepassxc-proxy.cpp Formatting the code. 2018-03-31 16:01:30 -04:00
NativeMessagingHost.cpp Merge branch 'master' into develop 2018-05-07 23:24:30 -04:00
NativeMessagingHost.h Formatting the code. 2018-03-31 16:01:30 -04:00