diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-23 19:28:17 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-23 19:28:17 +0100 |
| commit | 43ca3e5df9b51b69245412a2b05ed96170ad2e33 (patch) | |
| tree | fa7c3bae9e7e78b31215962402a25635c33fede7 /soltools/mkdepend/collectdircontent.cxx | |
| parent | 101116ea260cfeba2eb8352786601e06495d85bd (diff) | |
wrong conflict resolution in m63 merge corrected
Diffstat (limited to 'soltools/mkdepend/collectdircontent.cxx')
0 files changed, 0 insertions, 0 deletions