diff options
author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:03:27 +0200 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:03:27 +0200 |
commit | 9731c6fd5493b5aaf2127c581362fd89a44396a0 (patch) | |
tree | 3ec9d33ae9167a6f265929a5ed66b2d2d1b71b8f /solenv/inc/minor.mk | |
parent | 0b12767776118542325ed6b220d30d3a1b51cae1 (diff) |
jl152 #i77196# fixing merge conflicts
Diffstat (limited to 'solenv/inc/minor.mk')
0 files changed, 0 insertions, 0 deletions