diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-07 13:30:57 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-07 13:30:57 +0200 |
| commit | 0d08f74d42cdaf01e681726225af9b7f0e65a45f (patch) | |
| tree | 2e01528f6db000501ecc2df9b03cd1cc80246218 /extra/obexd | |
| parent | 7e625170ad4fd86bb2ee338c7be9a352bf418b00 (diff) | |
| parent | 9d36fcd5638035abf19f303deebd9e861d384254 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/cups/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
Diffstat (limited to 'extra/obexd')
0 files changed, 0 insertions, 0 deletions