diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 12:03:22 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 12:03:22 -0600 |
commit | 47108a24dee698bcd43d83be24e204ccd27776a3 (patch) | |
tree | 6d59d33328589397231fbc8e63693d0a9f671822 /pacman-kde-unstable.conf | |
parent | 4eeac77b1d53944af14def681a8763a473b60f9c (diff) | |
parent | 7ca4eb82ddb791881dc5c666f0d2400f3904c152 (diff) |
Merge commit '7ca4e'
Conflicts:
makechrootpkg.in
Diffstat (limited to 'pacman-kde-unstable.conf')
0 files changed, 0 insertions, 0 deletions