Merge commit 'ooo/OOO330_m12'
Conflicts: instsetoo_native/util/pack.lst solenv/inc/minor.mk
Showing
instsetoo_native/util/pack.lst
100755 → 100644
Please
register
or
sign in
to comment
Conflicts: instsetoo_native/util/pack.lst solenv/inc/minor.mk