diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-11 17:29:20 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-11 17:29:20 +0200 |
| commit | 7a42705e87e0da5d2417b4293729e3ee1ae3b33c (patch) | |
| tree | 04aa72c4fdff134e2c5ae9f539e092d5faafe808 /extra/xorg-oclock | |
| parent | e6ced89f44186539d8fedf73b62024aa2214230e (diff) | |
| parent | 337402b957bab442da9e0d46ee7a8d8f32ede3ce (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/botan/PKGBUILD
community/qgo/PKGBUILD
community/ragel/PKGBUILD
extra/avahi/PKGBUILD
extra/kdepim/PKGBUILD
extra/libva/PKGBUILD
extra/libwnck3/PKGBUILD
extra/orc/PKGBUILD
extra/python/PKGBUILD
extra/python2/PKGBUILD
extra/qt3/PKGBUILD
Diffstat (limited to 'extra/xorg-oclock')
0 files changed, 0 insertions, 0 deletions