diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-09 15:21:15 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-09 15:21:15 +0100 |
| commit | 784f841dd02d4cf93e02aeab3e17cb7de1a7937f (patch) | |
| tree | e5c1dc07e7ca785a346ef10efa7b43e212b7c884 /extra/cogl | |
| parent | ebd15ff2a4a2dd51cc6d862bcef96a1b6d753336 (diff) | |
| parent | 707457876743e969be9eb163c36928978df245cd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-mpi4py/PKGBUILD
community/sword/PKGBUILD
community/xiphos/PKGBUILD
extra/bitlbee/PKGBUILD
extra/nicotine/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-glib2/PKGBUILD
Diffstat (limited to 'extra/cogl')
0 files changed, 0 insertions, 0 deletions