summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'debian/sid' into debian/jessie-backportsdebian/jessie-backportsUlrike Uhlig2016-03-071-2/+2
|\
| * Debian packaging Git repository now lives on Alioth.Ulrike Uhlig2016-03-071-2/+2
* | rebuild for Jessie backportsdebian/4.4.7+dfsg-1_bpo8+1Ulrike Uhlig2016-01-211-0/+6
* | Merge branch 'debian/sid' into debian/jessie-backportsUlrike Uhlig2016-01-2143-4310/+3940
|\ \ | |/
| * Release new upstream version 4.4.7ubuntu/4.4.7+dfsg-0ubuntu1_xenialdebian/4.4.7+dfsg-1Ulrike Uhlig2016-01-201-0/+7
| * Merge branch 'tails/jessie' into debian/sidUlrike Uhlig2016-01-2043-4310/+3933
| |\
| | * Correct debian/changelogUlrike Uhlig2016-01-201-1/+2
| | * Add missing dependency on dosfstools.intrigeri2016-01-171-0/+1
| | * tails-installer (4.4.7+dfsg-0tails1)tails/4.4.7+dfsg-0tails1anonym2016-01-111-0/+15
| | * Merge tag 'upstream/4.4.7+dfsg' into tails/jessieanonym2016-01-1141-4310/+3916
| | |\
| | | * Imported Upstream version 4.4.7+dfsgupstream/4.4.7+dfsganonym2016-01-1172-16574/+9531
| | | |\
| | | | * Update POT and PO files.tails-installer_4.4.7anonym2016-01-1141-256/+237
| | | | * Remove buggy PO files.intrigeri2016-01-012-1746/+0
| | | | * Import PO files from Transifex, refresh PO file.intrigeri2016-01-0143-4061/+5432
| | | | * Merge branch 'feature/jessie'intrigeri2015-12-16118-36176/+32644
| | | | |\
| | | | * \ Merge tag 'liveusb-creator_3.14'intrigeri2015-12-1653-2225/+1021
| | | | |\ \
| | | | | * | Import PO files from Transifex, update POT and PO files.liveusb-creator_3.14anonym2015-12-1453-2225/+1021
| | | | |/ /
| | | | * | Change the translation of the word key to be consistent with the documentationTails developers2015-12-111-12/+12
| | | | * | [fr] Updating the french translationYour Name2015-12-111-14/+46
| | | | * | Import PO files from Transifex, update POT and PO files.tails-installer_3.13anonym2015-11-0253-5937/+8122
| | | | * | Merge remote-tracking branch 'origin/feature/9672-rework-installer-wording-on...anonym2015-10-274-348/+360
| | | | |\ \
| | | | | * | Run make gui.feature/9672-rework-installer-wording-on-wheezyintrigeri2015-10-033-15/+7
| | | | | * | Update wording for tails/wheezy.Ulrike Uhlig2015-10-031-9/+9
| | | | | * | Merge remote-tracking branch 'installer/master' into master_wordingUlrike Uhlig2015-10-0259-5301/+6523
| | | | | |\ \
| | | | | * | | use GNOME HIG for text size, ran make guiu2015-07-033-4/+4
| | | | | * | | use GNOME HIG for text sizeu2015-07-031-2/+2
| | | | | * | | ran make gui with new Tails installer wordingu2015-07-033-54/+72
| | | | | * | | Change Tails installer wording.u2015-07-031-287/+289
| | | | * | | | Import PO files from Transifex, update POT and PO files.tails-installer_3.12anonym2015-10-2653-687/+1333
| | | | | |/ / | | | | |/| |
| | | * | | | Imported Upstream version 4.3.2+dfsgupstream/4.3.2+dfsganonym2015-11-0987-9052/+9569
| | | |\ \ \ \
* | | | | | | | Adjust gbp.conf for jessie-backports.intrigeri2016-01-161-1/+1
* | | | | | | | 4.4.6+dfsg-1~bpo8+1debian/4.4.6+dfsg-1_bpo8+1Ulrike Uhlig2016-01-151-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'debian/sid' of git.tails.boum.org:451f/liveusb-creator into deb...Ulrike Uhlig2016-01-020-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'installer/debian/sid' into debian/sidUlrike Uhlig2015-12-013-2/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'installer/feature/jessie' into debian/sidUlrike Uhlig2015-11-2652-1940/+1942
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge remote-tracking branch 'installer/debian/sid' into debian/sidUlrike Uhlig2016-01-021-0/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tails-installer (4.4.6+dfsg-1)debian/4.4.6+dfsg-1intrigeri2016-01-011-0/+8
| * | | | | | | | | | Revert gbp.conf to be suited for Debian unstable.intrigeri2016-01-011-1/+1
| * | | | | | | | | | Merge branch 'tails/jessie' into debian/sidintrigeri2016-01-0154-1377/+1390
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | tails-installer (4.4.5+dfsg-1)debian/4.4.5+dfsg-1debian/experimentalintrigeri2015-11-291-0/+6
| * | | | | | | | | | Merge branch 'tails/jessie' into debian/experimentalintrigeri2015-11-2962-8637/+1593
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tails-installer (4.4.4+dfsg-1)debian/4.4.4+dfsg-1intrigeri2015-11-251-0/+8
| * | | | | | | | | | | Adjust gbp.conf for Debian experimental.intrigeri2015-11-251-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tails/jessie' into debian/sidUlrike Uhlig2015-12-1164-9963/+2932
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add missing dependency on p7zip-full.intrigeri2015-12-091-0/+1
| * | | | | | | | | tails-installer (4.4.6+dfsg-0tails1)tails/4.4.6+dfsg-0tails1intrigeri2015-12-021-0/+8
| * | | | | | | | | Merge tag 'upstream/4.4.6+dfsg' into tails/jessieintrigeri2015-12-0252-1377/+1381
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Imported Upstream version 4.4.6+dfsgupstream/4.4.6+dfsgintrigeri2015-12-0252-1377/+1381
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Update POT and PO files.tails-installer_4.4.6feature/jessieintrigeri2015-12-0251-1377/+1377
| | | * | | | | | | Merge remote-tracking branch '451f/bugfix/10660+dontcrashpristineusb' into fe...intrigeri2015-12-011-0/+4
| | | |\ \ \ \ \ \ \