diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-29 10:37:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-29 10:37:36 +0200 |
| commit | e7fca19e8659c6c5b6fbb34527b129e655514f1e (patch) | |
| tree | c9401e3d97a233417fb9fea6ba36fcaa4b74f2b1 /extra/ntfs-3g_ntfsprogs/PKGBUILD | |
| parent | 0a1081b50cec0fd8e54282d5f503feb0769eaa4f (diff) | |
| parent | bab69e0f720c6f189c4486b7b945079be23f0a4b (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-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/python-pyzmq/PKGBUILD
extra/cabal-install/PKGBUILD
extra/gtk-qt-engine/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
Diffstat (limited to 'extra/ntfs-3g_ntfsprogs/PKGBUILD')
0 files changed, 0 insertions, 0 deletions