diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-08 15:15:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-08 15:15:36 -0300 |
| commit | 79836a031d6d4c48982b4cbffb40bf6bf09b3798 (patch) | |
| tree | e6092df6df7e313d6637c35645bd2b1d174930bd /community/python-cjson/PKGBUILD | |
| parent | 38e55a4f9ca44d32cc497abdafe5bcd4df23704b (diff) | |
| parent | 6aeb515f4afd10afb53b21df18d03b0d5f3a200f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ruby-gtk2/PKGBUILD
community/scite/PKGBUILD
extra/pulseaudio/PKGBUILD
multilib/lib32-libsamplerate/PKGBUILD
staging/kdelibs/PKGBUILD
Diffstat (limited to 'community/python-cjson/PKGBUILD')
0 files changed, 0 insertions, 0 deletions