diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-22 12:32:21 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-22 12:32:21 +0200 |
| commit | a019d9889a5b3803d57833c4b4502533f029c98b (patch) | |
| tree | a928035510b10f044f532fe1a6f46a22137809ad /~lukeshu | |
| parent | 53f7b4b48972c757f0e68d4b02847a19e23d7232 (diff) | |
| parent | af1e6c210b43ea6b8e043524edccb1d0befd257f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/portaudio_cpp/PKGBUILD
extra/cmake/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/telepathy-glib/PKGBUILD
Diffstat (limited to '~lukeshu')
0 files changed, 0 insertions, 0 deletions