Rebased ref, commits from common ancestor:
commit d981691c56759d779d617d749f5b9f6a18ae8a8f
Author: Katarina Behrens
Date: Mon Oct 24 15:16:37 2016 +0200
screenshot annotation: put back removed fields
I hate you loplugin !!!
Change-Id:
cui/source/dialogs/screenshotannotationdlg.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 2b34cf0aa20eaa3beba095420aea8e0fffb32749
Author: Katarina Behrens
Date: Mon Oct 24 15:16:37 2016 +0200
screenshot
cui/source/dialogs/screenshotannotationdlg.cxx | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
New commits:
commit f0b83ae615ea5832d63558ff1c4efaa0e6844150
Author: Katarina Behrens
Date: Thu Oct 20 20:31:40 2016 +0200
screenshot
cui/source/dialogs/screenshotannotationdlg.cxx | 43 -
1 file changed, 42 insertions(+), 1 deletion(-)
New commits:
commit 1a781466c679874d01c7a6badc7f941dfde354d9
Author: Katarina Behrens
Date: Tue Oct 18 19:29:00 2016 +0200
screenshot
Rebased ref, commits from common ancestor:
commit 3fd40763973eb02019a7ffe67f7c10511624b73d
Author: Armin Le Grand
Date: Fri Aug 26 16:26:34 2016 +0200
screenshot: fixup some details for screenshot dlg
Edge-rounding and linewidth for selection/cursor, default
cui/source/dialogs/screenshotannotationdlg.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit fc4da7c04c7a873afa1d583ff3bcd2d0e4dc6f70
Author: Armin Le Grand
Date: Fri Aug 26 19:08:19 2016 +0200
screenshot: corrections for linux build
cui/source/dialogs/screenshotannotationdlg.cxx | 48 +++--
1 file changed, 30 insertions(+), 18 deletions(-)
New commits:
commit 5989294c521eb155952ceb61f6ef806391070676
Author: Armin Le Grand
Date: Fri Aug 26 16:26:34 2016 +0200
screenshot: