diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:47 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:47 +0200 |
| commit | 44863c2f2fd78c291092037aaf0d7abfa21f773d (patch) | |
| tree | e37ec8eadc355883b61f7aef84cfbe9b5f5fa642 /sd/prj | |
| parent | 98c355692e3479f86fccb05e99170c5ccc56aeba (diff) | |
| parent | e95ca98b9aaf2399200566373a25a572a43307f4 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sd/prj/d.lst
sd/source/ui/dlg/sdabstdlg.cxx
sd/util/makefile.mk
Diffstat (limited to 'sd/prj')
| -rw-r--r-- | sd/prj/d.lst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/prj/d.lst b/sd/prj/d.lst index e69de29bb2d1..263c55010fb9 100644 --- a/sd/prj/d.lst +++ b/sd/prj/d.lst @@ -0,0 +1,2 @@ + +..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
\ No newline at end of file |