diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (patch) | |
| tree | 7a7506427f1225f68a2179fa9e40f9e013549ea4 /sw/inc/pch/precompiled_sw.hxx | |
| parent | 75999228ead62620ed8b9d3970277bf916af3d6d (diff) | |
| parent | 8409cfd0c4842fae1e087f8c932748f9305871a8 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sw/inc/pch/precompiled_sw.hxx')
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index fd7f3b135365..c137892db46c 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -920,8 +920,12 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" +<<<<<<< local #include "vcl/button.hxx" #include "vcl/imgcons.hxx" +======= +#include "vcl/imagebtn.hxx" +>>>>>>> other #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" |