diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-18 10:23:47 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-18 10:23:47 +0100 |
| commit | 929a5d6e5e12fa9528758e5e223e88048e04f363 (patch) | |
| tree | f0ae0c4ce7bbb928b3eaf24776bbf5a406d31fb6 /~lukeshu | |
| parent | eb6ae6ca0cb676b88fb9f22ccd4816df6abc4d2c (diff) | |
| parent | f5da39f098910b7b6f92dfbcc0c4d5d235d4a57d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
extra/colord/PKGBUILD
extra/redland/PKGBUILD
Diffstat (limited to '~lukeshu')
0 files changed, 0 insertions, 0 deletions