Tweak win32/64 build doc

[bacula/bacula] / bacula / technotes

diff --git a/bacula/technotes b/bacula/technotes
index a4ded2e0677a1026e43675c9d0836685f8eb1c2e..b9e81e1252f7600c4f9f42c899f6b5e7392a434c 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,13 +2,14 @@
           
 General:
 
+10Jul09
+ebl  Print correct JobId in bls, should fix #1331
+kes  Apply python detect patch from Bastian Friedrich <bastian.friedrich@collax.com>
 09Jul09
-<<<<<<< HEAD:bacula/technotes
+kes  Add --with-hostname to ./configure
 mvw  Changed ACL_OTHER into ACL_OTHER_OBJ as IRIX doesn't seem to have
      ACL_OTHER. Fixes bug #1333
 =======
-kes  Add --with-hostname to ./configure
->>>>>>> Add --with-hostname to ./configure:bacula/technotes
 04Jul09
 mvw  Change checking for acl and xattr support from first file to
      job level.