diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-09 21:41:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-09 21:41:18 +0100 |
| commit | 9c9dcb7ee95f321e5a4243792500f059231722cb (patch) | |
| tree | a528497046cad28335c8dbcb413fc14e85e5f52e /core/links | |
| parent | 938595dcb9f3adf10880b0958f02633f23d0d9f1 (diff) | |
| parent | 9e5276831865e251c8d74a830da4908eab65cbb3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdebase/PKGBUILD
extra/openal/PKGBUILD
Diffstat (limited to 'core/links')
0 files changed, 0 insertions, 0 deletions