Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

diff --git a/doc/manual/dvdomatic.css b/doc/manual/dvdomatic.css
index eb366b5fd13b7a5534bbe2bfd0004098c5c824cb..0e4982f201cefa088379a16f89d46804de17ee05 100644 (file)
--- a/doc/manual/dvdomatic.css
+++ b/doc/manual/dvdomatic.css
@@ -4,6 +4,7 @@ body {
     margin-right: 4em;
     margin-top: 1em;
     margin-bottom: 1em;
+    background-color: #E2E8EE;
 }
 
 div.sidebar {
@@ -14,5 +15,5 @@ div.sidebar {
     border-color: #000000;
     border-width: 2px;
     border-style: solid;
-    background-color: #0E9E75;
+    background-color: #E2E8EE;
 }

diff --git a/wscript b/wscript
index 2bde0077e09f7286c57fb1c7426aa5684e0733f8..28d1f41bfe17bbe6baf8a92c4654c64c7c6f6daf 100644 (file)
--- a/wscript
+++ b/wscript
@@ -128,7 +128,7 @@ def build(bld):
         bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
 
 def dist(ctx):
-    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock*'
+    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html'
 
 def create_version_cc(version):
     if os.path.exists('.git'):