diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
| commit | 80c5e58be137999f5d9690b682e888436ffe69b2 (patch) | |
| tree | 5aef91b2cbc21ef5471d9ab69066ba7beaf747f0 /libre/virtualbox-libre/vboxbuild | |
| parent | 9866fa59a35ebbae88bec725eba8551f34990e03 (diff) | |
| parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
core/openssl/PKGBUILD
extra/cabal-install/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/kdebindings-python/PKGBUILD
Diffstat (limited to 'libre/virtualbox-libre/vboxbuild')
0 files changed, 0 insertions, 0 deletions