summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/devel' into feature/10779-start-haveged-...feature/10779-start-haveged-earlierintrigeri2016-06-092-1/+13
|\
| * Merge remote-tracking branch 'origin/devel' into develanonym2016-06-081-0/+6
| |\
| | * Add changelog dummy entry for 2.6.intrigeri2016-06-081-0/+6
| * | Merge remote-tracking branch 'origin/stable' into develanonym2016-06-082-0/+7
| |\ \ | | |/ | |/|
| * | Merge branch 'stable' into develanonym2016-06-081-4/+5
| |\ \
| * \ \ Merge branch 'stable' into develanonym2016-06-081-6/+0
| |\ \ \
| * \ \ \ Merge branch 'stable' into develanonym2016-06-0830-616/+354
| |\ \ \ \
| * \ \ \ \ Merge branch 'testing' into develanonym2016-06-0723-248/+6454
| |\ \ \ \ \
| * | | | | | Add dummy changelog entry.anonym2016-06-071-0/+6
| * | | | | | Merge remote-tracking branch 'origin/testing' into develanonym2016-06-0751-4903/+6341
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-06-061-6/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into develanonym2016-06-0683-3764/+2280
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'testing' into develintrigeri2016-06-067-114/+125
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develintrigeri2016-06-061-1/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-06-042-14/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-06-028-228/+149
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-06-024-26/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into develanonym2016-06-0296-2126/+2962
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into develintrigeri2016-06-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develanonym2016-05-317-190/+161
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develintrigeri2016-06-018-191/+162
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'testing' into develintrigeri2016-05-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develintrigeri2016-05-273-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Thaw devel, which was frozen perhaps mistakenly (?).anonym2016-05-272-2/+2
| * | | | | | | | | | | | | | | | | | | Restore devel's base branch.anonym2016-05-261-1/+1
* | | | | | | | | | | | | | | | | | | | Adjust haveged pinning syntax to be compatible with our freezable APT reposit...intrigeri2016-06-091-1/+1
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/stable' into feature/10779-start-haveged...intrigeri2016-06-092255-152373/+124589
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/bugfix/11500-slow-qxl' into stableanonym2016-06-082-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/testing' into bugfix/11500-slow-qxlintrigeri2016-06-0751-4903/+6341
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Only enable QXL -specific X.Org configuration when a QXL graphic card is dete...intrigeri2016-06-062-0/+1
| | * | | | | | | | | | | | | | | | | | Revert "Revert "Disable surfaces support in QXL X.Org video driver.""intrigeri2016-06-061-0/+6
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Restore stable's base branch.anonym2016-06-081-1/+1
| * | | | | | | | | | | | | | | | | | Also remove unreleased changelog entries.anonym2016-06-081-4/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into stableanonym2016-06-081-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'testing'anonym2016-06-081-6/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Remove changelog entries for releases that were never released.anonym2016-06-081-6/+0
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into stableanonym2016-06-08425-14695/+25130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'testing'anonym2016-06-082-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Thaw APT snapshots after Tails $VERSION was released.anonym2016-06-082-2/+2
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Remove UDFs for versions that were never released.anonym2016-06-084-42/+0
| | * | | | | | | | | | | | | | | | updated PO filesamnesia2016-06-0810-344/+112
| | * | | | | | | | | | | | | | | | Update Known Issues and FAQ after releasing Tails 2.4.anonym2016-06-082-38/+1
| | * | | | | | | | | | | | | | | | Document the Icinga2 and VPN setup for contributors.bertagaz2016-06-071-0/+31
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/testing'anonym2016-06-07361-11397/+24186
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | releasing version 2.4anonym2016-06-0722-242/+6448
| | | * | | | | | | | | | | | | | | Add missing words.anonym2016-06-071-1/+1
| | | * | | | | | | | | | | | | | | Improve wording.anonym2016-06-071-3/+3
| | | * | | | | | | | | | | | | | | Clarify manual test.anonym2016-06-071-4/+4
| | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Add dummy changelog entry.anonym2016-06-071-0/+6
| | | * | | | | | | | | | | | | | Update IDF file for DAVE.anonym2016-06-061-3/+3