diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-27 10:08:53 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-27 10:08:53 +0200 |
| commit | 9262eae11412e7e7925ba230761f86fcc3756002 (patch) | |
| tree | 4caf8c64e442feb4323f8710d5c6d7ee2c3e0d77 /community-staging | |
| parent | a9a4a92d8375d35e09a3cf9d50921d8839d7c79a (diff) | |
| parent | c8729cab8302ab82e01135a22fb9fa9704f1559b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.conf
community-testing/cdemu-daemon/cdemud.rc
extra/perl-bit-vector/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'community-staging')
0 files changed, 0 insertions, 0 deletions