[Pkg-privacy-commits] [tails-installer] 01/35: Merge branch 'develop'

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to annotated tag 3.12.0
in repository tails-installer.

commit 8daf3b753b6b621c6ee2ba5e0c1a2eec41865b38
Merge: 4f8d12b 19426d6
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Apr 30 12:17:40 2013 -0400

    Merge branch 'develop'

 data/liveusb-creator.nsi    |   7 ++-
 data/liveusb-creator.nsi.in |   6 +-
 liveusb-creator             |   4 +-
 liveusb/creator.py          |  61 +++++++++++---------
 liveusb/gui.py              |  60 ++++++++++++++------
 liveusb/windows_dialog.py   | 133 +++++++++++++++++++++++++-------------------
 setup.py                    |   4 +-
 tests/test_creator.py       |   4 +-
 8 files changed, 170 insertions(+), 109 deletions(-)

diff --cc data/liveusb-creator.nsi
index 03f3760,9f6aefd..8412a13
--- a/data/liveusb-creator.nsi
+++ b/data/liveusb-creator.nsi
@@@ -1,9 -1,9 +1,12 @@@
- Name "LiveUSB Creator 3.11.7"
- OutFile "liveusb-creator-3.11.7-setup.exe"
+ Name "LiveUSB Creator 3.11.8"
+ OutFile "liveusb-creator-3.11.8-setup.exe"
+ 
+ !include "MUI2.nsh"
+ XPStyle on
  
 +!include "MUI2.nsh"
 +XPStyle on
 +
  SetCompressor lzma
  
  InstallDir "$PROGRAMFILES\LiveUSB Creator"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git