Conflicts: external/boost/StaticLibrary_boost_system.mk Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b Reviewed-on: https://gerrit.libreoffice.org/6282 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>