diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:46 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:46 +0200 |
| commit | 4a09d16972dafb48293a14c3070da610d0c238d1 (patch) | |
| tree | d40c0ef7cbdb944b414fc0499e7a36873976174f /sd | |
| parent | 0e112e64f73df89dc5d2d6d504e2839c8b500c14 (diff) | |
| parent | 18054e19eba750f8b56bb7c6c463f39444716a4d (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
sd/prj/d.lst
sd/util/makefile.mk
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/prj/d.lst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/prj/d.lst b/sd/prj/d.lst index 8d890455e5ad..716d18879530 100644 --- a/sd/prj/d.lst +++ b/sd/prj/d.lst @@ -1,2 +1,3 @@ -..\%__SRC%\misc\sdfilt.component %_DEST%\xml\sdfilt.component
\ No newline at end of file +..\%__SRC%\misc\sdfilt.component %_DEST%\xml\sdfilt.component +..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
\ No newline at end of file |