diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
| commit | eac91db8a23223e456fb2f17e13e2cc328b2b7cf (patch) | |
| tree | ccd4fa51769a489c85f423765b1a7eab9d46c47d /sc/Library_sc.mk | |
| parent | 9b9f11dfe23a3ec947725d6efb837d3783f1ddb5 (diff) | |
| parent | 1250574d40dd657188006d9efafbf28c27275f6c (diff) | |
Merge branch 'libreoffice-3-4'
Conflicts:
sc/CppunitTest_sc_ucalc.mk
sc/Module_sc.mk
sc/qa/unit/ucalc.cxx
sc/source/core/tool/dbcolect.cxx
sc/source/filter/excel/excimp8.cxx
sc/source/filter/inc/excimp8.hxx
sc/source/ui/docshell/impex.cxx
sc/source/ui/unoobj/datauno.cxx
Diffstat (limited to 'sc/Library_sc.mk')
| -rw-r--r-- | sc/Library_sc.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 8559cc3d4a22..c57671ed7a12 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -130,7 +130,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/pivot2 \ sc/source/core/data/poolhelp \ sc/source/core/data/postit \ - sc/source/core/data/scdpoutputimpl \ sc/source/core/data/segmenttree \ sc/source/core/data/sheetevents \ sc/source/core/data/sortparam \ |