diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-23 12:39:26 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-23 12:39:26 +0200 |
commit | b67a0a32a9eb1abda00ac7698a1cd2c422d3c1f3 (patch) | |
tree | b912be3c7517a6fa0b520a94be5ff5aa59ea5222 /~fauno | |
parent | 4789a82714c4cce4cc1cbd798e3a9d9eff777d50 (diff) | |
parent | 321ac14a17f6fddead571221187604e3ce254451 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/projectm/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions