diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-27 21:27:16 +0100 |
|---|---|---|
| committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-08-31 19:31:14 +0200 |
| commit | 6a14051b0a60f52ddf138114250e5e9a5143f3a0 (patch) | |
| tree | eabf8e6abbfe696f75ff3fdede0c9e91714fde1a /javaunohelper | |
| parent | ac5c61b4b63f6dea7973a181d08d8c05d62cb13b (diff) | |
squash into Marco's commit.
g
Conflicts:
vcl/inc/salbmp.hxx
Change-Id: I57d1e4b8e4909ce0b82c9e61ca271768cc73cd8b
Diffstat (limited to 'javaunohelper')
0 files changed, 0 insertions, 0 deletions