diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-14 10:53:59 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-14 10:53:59 +0100 |
| commit | 02e61c89c8b9d79879335bfbd66f9e6b59982848 (patch) | |
| tree | fca57eeca21f97a06309051f625a2b7517b1ec71 /~fauno/haskell-digest | |
| parent | 846195ec63b8881bda11580883ec06ae821a2669 (diff) | |
| parent | 0bf564cf7a3d99207457267c75f92ceb67197537 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/libgexiv2/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/pidgin/PKGBUILD
extra/xorg-xrandr/PKGBUILD
Diffstat (limited to '~fauno/haskell-digest')
0 files changed, 0 insertions, 0 deletions