Merge branch 'maint'
commitcdb241a7e7cb3f02e6878ab268173d7af00c0255
authorJohannes Sixt <j6t@kdbg.org>
Sat, 14 Jan 2017 21:00:25 +0000 (14 22:00 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sat, 14 Jan 2017 21:00:25 +0000 (14 22:00 +0100)
tree03860e37848adb19660ba891769be557caaf0029
parent330afda8771d5cef0795d65891d92db682746194
parent918875237486335ab1fc23d8cf51bc39183b4b97
Merge branch 'maint'

* maint:
  Rename window title "Watches" to "Watched Expressions".
  Use QDockWidget's toggle action to make docking windows visible.
kdbg/dbgmainwnd.cpp
kdbg/dbgmainwnd.h