smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged master into v1-dev

Browse source
This commit is contained in:
Nick Bolton 2019-05-03 13:35:39 +01:00
parent 751fcffc87
commit 55dd155e56
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -474,4 +474,7 @@ Feature #3119: Mac OS X secondary screen
Task #2905: Unit tests: Clipboard classes
Task #3072: Downgrade Linux build machines
Task #3090: CXWindowsKeyState integ test args wrong
<<<<<<< HEAD
=======
>>>>>>> 2d76a4c5... Create ChangeLog