diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-03 10:17:32 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-03 10:17:32 +0100 |
| commit | e870acdc8dab25660ea941076debf87e6ef6639e (patch) | |
| tree | 3f3e94d8d34bc66d3b56f57c0b2429ec47b5f5f2 /~xihh | |
| parent | 48b4fc34e4c4877ffd359d3108042b64e0b81f5d (diff) | |
| parent | e3f70522f1f35359d9307f478c96dace20a51ca1 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ibus-anthy/PKGBUILD
community/libpaper/PKGBUILD
community/plan9port/PKGBUILD
extra/grantlee/PKGBUILD
extra/vlc/PKGBUILD
Diffstat (limited to '~xihh')
0 files changed, 0 insertions, 0 deletions