diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-15 11:59:47 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-15 11:59:47 +0100 |
commit | 8277e3709c16c740a06fa50da38f0f44969b6ad1 (patch) | |
tree | a791b9559ca921e1819f3188376d6882ca335ed9 /java-ugly | |
parent | 34c69f47ed6bbb523c862baa8c7b18957ffd5311 (diff) | |
parent | a829a3b1a4b3eefc7adb1d630f071247e79b9f72 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/linux-tools/PKGBUILD
extra/ntp/PKGBUILD
libre/linux-libre-tools/PKGBUILD
Diffstat (limited to 'java-ugly')
0 files changed, 0 insertions, 0 deletions