diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
|---|---|---|
| committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
| commit | 5eb74b1fcad83c605cc00e377460e0ae313d7277 (patch) | |
| tree | dae1a098290f55460e0da0a024105c1e28e19410 /svtools/Library_svt.mk | |
| parent | dafa1f576482bc7a0086c353ffff0dbd594a7915 (diff) | |
| parent | fa99c1ea4f6d450cc12998d4513ed8cf77bafcc9 (diff) | |
Merge branch 'feature/template-dialog'
Conflicts:
sfx2/Library_sfx.mk
sfx2/inc/sfx2/sfxcommands.h
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/appl/appserv.cxx
svtools/Library_svt.mk
Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6
Diffstat (limited to 'svtools/Library_svt.mk')
| -rw-r--r-- | svtools/Library_svt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 7ae873aa1f14..2dcec425cc86 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ )) $(eval $(call gb_Library_use_externals,svt,\ - icuuc \ + icuuc \ jpeg \ )) |