diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-10 14:02:40 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-10 14:02:40 +0100 |
| commit | bf8d5e47ebdb788735d74c8232db8ec4a724a0bb (patch) | |
| tree | 807d2f70dec261ec60d7943f1d8a7cd1fc9422ab /java/java-rxtx | |
| parent | 7b801d14eb78615912e7456a4654c2488bdee4d5 (diff) | |
| parent | 15afd71b619115bc72670c443a6d1b75275ead0c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/giggle/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libgusb/PKGBUILD
Diffstat (limited to 'java/java-rxtx')
0 files changed, 0 insertions, 0 deletions