diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
| commit | b2b3a3e5241f31d00189615d3a86d5e0efd2ca25 (patch) | |
| tree | 38cbc9ae8f219a9a921732d6132b50ba57ba7dab /gnu | |
| parent | a4a706ff05afab9bb61870c0049aedb23072cec1 (diff) | |
| parent | 8f0418e4a239ba973834592537b474d3aac52d5b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
core/libcap/PKGBUILD
extra/ncmpc/PKGBUILD
extra/php/PKGBUILD
extra/sqlite/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/icecat/PKGBUILD
Diffstat (limited to 'gnu')
0 files changed, 0 insertions, 0 deletions