diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
| commit | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (patch) | |
| tree | bc42529997fa58fc26481c8ba7524560f3baa5af /extra/gjs | |
| parent | f87cdf22eb712b5b1c118f768d4ff710fc839403 (diff) | |
| parent | d466ef49f224a9347fe0375eac8126725e10a0a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
community/flac123/PKGBUILD
community/flashrom/PKGBUILD
community/liblockfile/PKGBUILD
community/python-cjson/PKGBUILD
community/tcpflow/PKGBUILD
extra/vlc/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
Diffstat (limited to 'extra/gjs')
0 files changed, 0 insertions, 0 deletions