framework/source/uielement/toolbarmanager.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ccad3636f8577b1e89a8e3064dd51d2bd4d53751
Author: Tobias Madl
Date: Wed Nov 19 12:47:05 2014 +
merge fix
Change-Id: If567ad20c9bfbe93da8ea73a4e36b46
framework/source/uielement/toolbarmanager.cxx |4 ++--
vcl/opengl/gdiimpl.cxx|3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit ce423057fd995d7ba1d968db6de6f26cc3b6f374
Author: Tobias Madl
Date: Tue Nov 11 15:38:40 2014 +
merge