diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-13 10:28:49 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-13 10:28:49 +0200 |
| commit | 81dced2a29e3d4cb05f004e5efe3bd2abe207b15 (patch) | |
| tree | 9772090003f7b9871a0a4d19f65f8fa32c9409c8 /core/sysvinit | |
| parent | 1f5072dbfe77090d9ea49bdd7501f21892729d88 (diff) | |
| parent | 843685ce9dd76d37a4c7b0230eacb6d26bdf30dd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/happy/PKGBUILD
community-staging/haskell-dataenc/PKGBUILD
community-staging/haskell-quickcheck/PKGBUILD
community/gnonlin/PKGBUILD
extra/bochs/PKGBUILD
Diffstat (limited to 'core/sysvinit')
0 files changed, 0 insertions, 0 deletions