update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6289 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index e7bff4a7bab57d498332bda356eb618dc7a5fbcf..3ac80e0e4423a3ff6c68f2dff3a82dd97d8a6847 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -71,6 +71,9 @@ Professional Needs:
    and http://www.openeyet.nl/scc/ for managing customer changes
 
 Priority:
+- Use "./config no-idea no-mdc2 no-rc5" on building OpenSSL for
+  Win32 to avoid patent problems.
+- Plugins
 - Implement Despooling data status.
 === Duplicate jobs ===
    hese apply only to backup jobs.
@@ -150,8 +153,10 @@ Priority:
   this kind of problem.  Probably the best solution is to make the
   first thread simply start using the Volume in drive 1 rather than
   transferring it to drive 0.
+>>>>>>> .r6288
 - Complete Catalog in Pool
 - Implement Bacula plugins -- design API
+>>>>>>> .r6079
 - Scripts
 - Prune by Job
 - Prune by Job Level