[Libreoffice-commits] .: 2 commits - .gitignore tail_build/prj

[Libreoffice Gerrit user]

 .gitignore               |    1 -
 tail_build/prj/build.lst |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 827c3806ada71b1e6701608621fd729cf54b1fc8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Nov 18 12:53:01 2012 +0100

    repo-list is gone since 664012b313f3c3cd5666fc6f943fc8152e503e23
    
    Change-Id: I2178f60a75a0436c66f825fe001e23f6aefb0e97

diff --git a/.gitignore b/.gitignore
index e1799e2..f7978e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,6 @@
 /configure
 /desktop/scripts/soffice.sh
 /makefile.mk
-/bin/repo-list
 /src.downloaded
 /ooo.lst
 /intltool-extract.in
commit 81fc9abeb87e9322f354fc9743cac12d95820d04
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Nov 20 22:17:58 2012 +0100

    tail_build: forgot to merge build.lst after cairo is in
    
    Change-Id: If745adf8541c980fa5cb1aa1b9f1ce9fa716504a

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 4f94749..7eec9e9 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat ICU:icu LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL