diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-22 15:46:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-22 15:46:48 +0200 |
| commit | 06dc337f60287526f4db95ce79a2ea506023bffa (patch) | |
| tree | 1eecfa4a004b96e68b0be4da4b9a9f797f1e633b /core/cryptsetup/PKGBUILD | |
| parent | f4e7589d7749be9ccaf3d1db51808ea1ab7c3282 (diff) | |
| parent | e9509842445d4a99493d1b643ffdafdca62263ae (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
extra/kdepim/PKGBUILD
extra/libgtop/PKGBUILD
libre/bitlbee-libre/PKGBUILD
Diffstat (limited to 'core/cryptsetup/PKGBUILD')
0 files changed, 0 insertions, 0 deletions