diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-24 12:24:55 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-24 12:24:55 -0400 |
| commit | d0e593c9f8deef75e1d7878787f62e111303d9ba (patch) | |
| tree | 29a5572db2336be21a109fe14954abd3e40861d9 /makepkg-i686.conf | |
| parent | f54791c247344f4077f1f25f933e62e7e45e3ab7 (diff) | |
| parent | 71b15aafb64b8c8d032eab7d41e15c6e4f648c58 (diff) | |
Merge commit '71b1' into complete
Conflicts:
mkarchroot.in
Diffstat (limited to 'makepkg-i686.conf')
0 files changed, 0 insertions, 0 deletions