| commit | 8c75156a84a5088506c49101efad199dc7b8d05e | |
| author | obo <obo@openoffice.org> | |
| Thu, 17 Jun 2010 07:00:57 +0000 (17 09:00 +0200) | ||
| committer | obo <obo@openoffice.org> | |
| Thu, 17 Jun 2010 07:00:57 +0000 (17 09:00 +0200) | ||
| tree | da1aa4b0253a6ba07ba82fb5b359798e58cb5cb7 | treesnapshot (tar.gz zip) |
| parent | 847c992a251bcbbcaf71d3b1b366d70971b4ef03 | commitdiff |
masterfix: #i10000# resolve merge problems
| sd/source/ui/dlg/PaneDockingWindow.cxx | diffblobblamehistory | |
| sd/source/ui/inc/PaneDockingWindow.hxx | diffblobblamehistory |