diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-20 09:17:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-20 09:17:42 +0200 |
| commit | 200f01be5982c89e1687f033eeb2516367f92d6f (patch) | |
| tree | 1a6e136f7fd568a0a1ea745759d6e671c7480d9c /extra/qemu | |
| parent | dbcbecee7567515b70b8ecbe9830a722b7c26f7c (diff) | |
| parent | 530e6e88786befa5d1bcd569e480f1b9fec5b102 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/nginx/PKGBUILD
community/remmina/PKGBUILD
extra/doxygen/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
testing/psmisc/PKGBUILD
Diffstat (limited to 'extra/qemu')
0 files changed, 0 insertions, 0 deletions