Merged master into v1-dev
This commit is contained in:
parent
751fcffc87
commit
55dd155e56
|
@ -474,4 +474,7 @@ Feature #3119: Mac OS X secondary screen
|
||||||
Task #2905: Unit tests: Clipboard classes
|
Task #2905: Unit tests: Clipboard classes
|
||||||
Task #3072: Downgrade Linux build machines
|
Task #3072: Downgrade Linux build machines
|
||||||
Task #3090: CXWindowsKeyState integ test args wrong
|
Task #3090: CXWindowsKeyState integ test args wrong
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 2d76a4c5... Create ChangeLog
|
||||||
|
|
Loading…
Reference in New Issue