Jonathan White ca27fb06d5

Merge branch 'master' ...

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

2018-08-24 09:42:38 -04:00

..

CMakeLists.txt

Move useful QTest template specializations to global header file

2018-01-24 13:32:37 +01:00

TemporaryFile.cpp

Formatting the code.

2018-03-31 16:01:30 -04:00

TemporaryFile.h

Formatting the code.

2018-03-31 16:01:30 -04:00

TestGui.cpp

Merge branch 'master'

2018-08-24 09:42:38 -04:00

TestGui.h

Formatting the code.

2018-03-31 16:01:30 -04:00

TestGuiPixmaps.cpp

Fixed issues with initial commit

2018-07-06 22:23:52 -04:00

TestGuiPixmaps.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00