diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-10 18:06:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-10 18:06:29 -0400 |
| commit | 33730fc272bec6376a28d8f813e9e35ec4f84175 (patch) | |
| tree | 0b85c3687a968fe83baa879952984f18f75f3061 /pacman-testing.conf | |
| parent | 534d2015b45e013b37e1edbb997bd4df27d7b8fd (diff) | |
| parent | 905198295dcb4fffcd16edff3fd7052a4cfc5788 (diff) | |
Merge remote-tracking branch 'arch/master'
Conflicts:
lib/common.sh
makechrootpkg.in
Diffstat (limited to 'pacman-testing.conf')
0 files changed, 0 insertions, 0 deletions