/rdbmaker/prj/

ef='/cgit/'>cgit logo index : lo/core
LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-09-28 16:57:02 +0200
committerAndras Timar <atimar@suse.com>2012-09-28 16:57:02 +0200
commitdbac379f77a034f10e62e607258fcbafad41b7ab (patch)
tree38c9db63bb991d8ff0ca8060274f8c6aaf92e3c9 /solenv/inc
parent822ac662c758916af546a293a408ee6fbb9cfe7e (diff)
parent8b97644bab0e9106b798a5b8969aa796e558ef3f (diff)
Merge branch 'master' into feature/killsdf
Conflicts: l10ntools/Module_l10ntools.mk l10ntools/source/merge.cxx solenv/gbuild/AllLangResTarget.mk solenv/gbuild/ExtensionTarget.mk solenv/gbuild/InstallModuleTarget.mk solenv/gbuild/TargetLocations.mk