diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-29 08:32:53 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-29 08:32:53 +0100 |
| commit | f1fb1946c076c285bc95baf9fd3390e4e2b9acdc (patch) | |
| tree | d902ae855f1c065fd5ffdd1da6c64689dfad84c3 /extra/openslp | |
| parent | ba24960f5e4f00fa98d065bebb829fc08d3645eb (diff) | |
| parent | 236f7ce9638c79b9ff594552540f3f5a2cbd8703 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mfs/PKGBUILD
core/procps-ng/PKGBUILD
extra/nx/PKGBUILD
Diffstat (limited to 'extra/openslp')
0 files changed, 0 insertions, 0 deletions