summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* dependency on python-qt4: I think this is the result of a mistake when resol...tails-installer_4.2u2015-08-261-1/+0
* remove merge conflict markeru2015-08-261-1/+0
* rewrap changelog at 80 charsu2015-07-251-34/+26
* Remove pyqt4 dependencyu2015-07-251-2/+1
* fix missing comma, due to merge conflictu2015-07-231-1/+1
* remove duplicate standards-version field, due to merge conflictu2015-07-231-1/+0
* Merge branch 'feature/jessie' into tails/jessieu2015-07-235-4/+25
|\
| * liveusb-creator-launcher(1): add a more complete description.intrigeri2015-07-231-0/+9
| * liveusb-creator-launcher(1): don't pretend this runs Tails "upgrader".intrigeri2015-07-231-1/+1
| * Add simple manpage for liveusb-creator-launcheru2015-07-221-0/+13
| * Merge remote-tracking branch '451f/feature/gtk3+9358-noicons' into feature/je...intrigeri2015-07-193-1/+0
| |\
| | * delete refresh.png.u2015-07-191-0/+0
| | * delete unused refresh iconu2015-07-181-1/+0
| | * delete unused imageu2015-07-181-0/+0
| * | Merge remote-tracking branch 'origin/feature/gtk3' into feature/jessieintrigeri2015-07-161-3/+3
| |\ \
| | * \ Merge remote-tracking branch 'origin/feature/gtk3' into feature/gtk3feature/gtk3Alan2015-07-1320-267/+144
| | |\ \
| | * | | Actually shows the end of the logAlan2015-07-051-3/+3
* | | | | Delete manpage from debian/u2015-07-223-13/+4
* | | | | Merge branch 'tails/jessie' of git.tails.boum.org:451f/liveusb-creator into t...u2015-07-192-3/+3
|\ \ \ \ \
| * | | | | debian/{gbp.conf,rules}: remove trailing whitespace.intrigeri2015-07-182-3/+3
* | | | | | Merge branch 'debian_feature-jessie' into tails/jessieu2015-07-1935-4176/+1228
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | liveusb-creator (3.11.6+tails1-18+jessie3)debian/3.11.6+tails1-18+jessie3debian_feature-jessieintrigeri2015-07-111-0/+13
| * | | | | Merge branch 'feature/jessie' into debian_feature-jessieintrigeri2015-07-113-2/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'feature/gtk3' into feature/jessieintrigeri2015-07-1132-4174/+1128
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'feature/jessie' into feature/gtk3intrigeri2015-07-092-2/+4
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Wrap text in the status log area.intrigeri2015-07-061-0/+1
| * | | | | liveusb-creator (3.11.6+tails1-18+jessie2+gtk3~4.gbp5abb19)debian_feature-gtk3intrigeri2015-07-061-0/+16
| * | | | | Merge branch 'feature/gtk3' into debian_feature-gtk3intrigeri2015-07-0611-217/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'feature/gtk3+9358-noicons' into feature/gtk3intrigeri2015-07-0611-217/+3
| | |\ \ \ \
| | | * | | | setup.py: disable installing deleted icon on Windows.intrigeri2015-07-061-1/+1
| | | * | | | Merge branch 'feature/gtk3' into feature/gtk3+9358-noiconsintrigeri2015-07-063-3/+100
| | | |\ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Unused image, replaced by tails-liveusb-headeru2015-07-061-0/+0
| | | * | | Use tails-liveusb-header image also for fedora.ini. If we deliver the package...u2015-07-061-1/+1
| | | * | | We do not use the original image anymore, updating manifest with our image.u2015-07-061-1/+1
| | | * | | This icon is still specified in fedora.ini but we do not install it, so we ca...u2015-07-061-0/+0
| | | * | | Delete icon and spec fileu2015-07-062-214/+0
| | | * | | delete unused iconsu2015-07-064-0/+0
| * | | | | liveusb-creator (3.11.6+tails1-18+jessie2+gtk3~3.gbp68acad)intrigeri2015-07-061-0/+13
| * | | | | Merge branch 'feature/gtk3' into debian_feature-gtk3intrigeri2015-07-061-2/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'feature/jessie' into feature/gtk3intrigeri2015-07-063-3/+100
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'debian_feature-jessie' into debian_feature-gtk3intrigeri2015-07-061-1/+6
| |\ \ \ \ \
| * | | | | | liveusb-creator (3.11.6+tails1-18+jessie2+gtk3~2.gbpd69530)intrigeri2015-07-051-0/+34
| * | | | | | Merge branch 'feature/gtk3' into debian_feature-gtk3intrigeri2015-07-056-56/+60
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'feature/jessie' into feature/gtk3intrigeri2015-07-055-45/+36
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Revert "Pulse the progressbar when no guess can be made"intrigeri2015-07-051-19/+9
| | * | | | | _get_datadir: consistently return a directory path without a trailing slash.intrigeri2015-07-051-2/+2
| | * | | | | Be stricter when looking for a local 'data' directory.intrigeri2015-07-051-1/+1
| | * | | | | Be stricter when looking at the script path's first component.intrigeri2015-07-051-2/+2
| | * | | | | Also log traceback to log fileAlan2015-07-041-1/+1
| | * | | | | More reliable datadir guessingAlan2015-07-041-2/+2