diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-05 20:59:20 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-05 20:59:20 +0200 |
commit | c6c2babeba94d2b11c98481d09ff4e9f403761dd (patch) | |
tree | 8002debe0b33ef12bc7ef915e2ff3d9f8faa37fa /community/dosbox/PKGBUILD | |
parent | 3bb7c2e9b57c32ae7c8d4d379f3ffb43a85cf7f3 (diff) | |
parent | 3c7a59bfd2b8340068df7dc196e0c9b612b9ef31 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
community/gmic/PKGBUILD
extra/lm_sensors/PKGBUILD
extra/lua/PKGBUILD
Diffstat (limited to 'community/dosbox/PKGBUILD')
0 files changed, 0 insertions, 0 deletions