Pull files from master

diff --git a/bacula/src/win32/External-mingw-w64 b/bacula/src/win32/External-mingw-w64
index 446674912ff4accf697f7a47d0016c1fb2587eaa..d0164508463e98bb15e802de60ef939792cff4bf 100644 (file)
--- a/bacula/src/win32/External-mingw-w64
+++ b/bacula/src/win32/External-mingw-w64
@@ -41,6 +41,8 @@ PTHREADS|http://www.bacula.org/depkgs-mingw32/pthreads-snap-2004-06-22.tar.gz
 ZLIB|http://www.bacula.org/depkgs-mingw32/zlib-1.2.3.tar.gz
 RSYNC|http://www.bacula.org/depkgs-mingw32/librsync-0.9.7.tar.gz
 #DB|http://www.bacula.org/depkgs-mingw32/db-4.7.25.tar.gz
+LZO|http://www.bacula.org/depkgs-mingw32/lzo-2.05.tar.gz
+
 # 
 # 
 # Original file locations
@@ -67,3 +69,4 @@ RSYNC|http://www.bacula.org/depkgs-mingw32/librsync-0.9.7.tar.gz
 # WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.tar.gz
 # ZLIB|http://www.zlib.net/zlib-1.2.3.tar.gz
 # DB|http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz
+# LZO|http://www.oberhumer.com/opensource/lzo/download/lzo-2.05.tar.gz
\ No newline at end of file

diff --git a/bacula/src/win32/External-mingw32 b/bacula/src/win32/External-mingw32
index c0b9794e1b5b2250cae918227f3dcaa51e3e97e2..64ba8f70141fa0518b6b554b5c84c227b87ff35a 100644 (file)
--- a/bacula/src/win32/External-mingw32
+++ b/bacula/src/win32/External-mingw32
@@ -41,6 +41,7 @@ WX|http://www.bacula.org/depkgs-mingw32/wxWidgets-2.8.7.tar.gz
 ZLIB|http://www.bacula.org/depkgs-mingw32/zlib-1.2.3.tar.gz
 RSYNC|http://www.bacula.org/depkgs-mingw32/librsync-0.9.7.tar.gz
 DB|http://www.bacula.org/depkgs-mingw32/db-4.7.25.tar.gz
+LZO|http://www.bacula.org/depkgs-mingw32/lzo-2.05.tar.gz
 # 
 # 
 # Original file locations
@@ -67,3 +68,4 @@ DB|http://www.bacula.org/depkgs-mingw32/db-4.7.25.tar.gz
 # WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.tar.gz
 # ZLIB|http://www.zlib.net/zlib-1.2.3.tar.gz
 # DB|http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz
+# LZO|http://www.oberhumer.com/opensource/lzo/download/lzo-2.05.tar.gz
\ No newline at end of file