[Libreoffice-commits] .: 4 commits - Repository.mk scp2/source

[Miklos Vajna]

 Repository.mk                        |    1 +
 scp2/source/ooo/file_library_ooo.scp |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 42ba40d83d82018b111f3b78bc75240bec948a60
Merge: 8090751... 67650df...
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Jul 2 00:21:10 2011 +0200

    Merge remote-tracking branch 'feature/gsoc2011_rtfimport'

commit 67650df91728a808ba43199ebd6915e6c1e7255e
Merge: 3cd5822... 5f77b98...
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Jun 25 01:51:04 2011 +0200

    Merge remote-tracking branch 'origin/master'

diff --cc scp2/source/ooo/file_library_ooo.scp
index b8bd6f7,d7c81a6..7965e1d
mode 100755,100644..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
commit 3cd58225b710e138da9cfd15809a59dd3de95408
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue May 24 17:28:08 2011 +0200

    Install rtftok library

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 922c07a..b8bd6f7 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -927,6 +927,8 @@ STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
 
 STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
 
+STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
+
 #ifdef WNT
 #if defined(_gcc3)
 
commit f17a6c91152f3c15accd8ee4398c955afbcbc867
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue May 24 13:28:40 2011 +0200

    Add rtftok library to Repository.mk

diff --git a/Repository.mk b/Repository.mk
index 3609e71..9ca8d7c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     rpt \
     rptui \
     rptxml \
+    rtftok \
     sax \
     sb \
     sc \