diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
commit | 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch) | |
tree | e1bf1a01ae7443e4a9f460200dad9580565b27c7 /community/gnome-mplayer | |
parent | 3e3dd870121c91097220248a601578b92d332f2b (diff) | |
parent | 37a1064b8105764414f279ced442e6ba2f63bea1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/dzen2/PKGBUILD
extra/boost/PKGBUILD
extra/libxmi/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'community/gnome-mplayer')
0 files changed, 0 insertions, 0 deletions