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/Package_inc.mk | |
| parent | wwSectionManager::SetUseOn: forgot to share first header/footer on even pages (diff) | |
| parent | Update thumnails for all template operations. (diff) | |
| download | core-5eb74b1fcad83c605cc00e377460e0ae313d7277.tar.gz core-5eb74b1fcad83c605cc00e377460e0ae313d7277.zip | |
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/Package_inc.mk')
| -rw-r--r-- | svtools/Package_inc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index b3c5e3b91293..70a5b40b7381 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.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 |