diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
| commit | 47d70348352503e92ba694a6a683f629eaa18215 (patch) | |
| tree | 7fb6f5ec75596b795dee52cfa35e3ef00a047cfb /extra/ocaml | |
| parent | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (diff) | |
| parent | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community/discid/PKGBUILD
community/dumb/PKGBUILD
community/dynamite/PKGBUILD
community/echat/PKGBUILD
community/fbdump/PKGBUILD
community/fldiff/PKGBUILD
community/flightgear/PKGBUILD
community/fonteditfs/PKGBUILD
community/freehdl/PKGBUILD
community/unclutter/PKGBUILD
community/unpaper/PKGBUILD
community/wmii/PKGBUILD
community/xkeycaps/PKGBUILD
community/xl2tpd/PKGBUILD
community/xmmsctrl/PKGBUILD
extra/gnutls/PKGBUILD
extra/inkscape/PKGBUILD
extra/ntp/PKGBUILD
extra/transmission/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/libreoffice/PKGBUILD
Diffstat (limited to 'extra/ocaml')
0 files changed, 0 insertions, 0 deletions