diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-11 08:16:23 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-11 08:16:23 +0100 |
| commit | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (patch) | |
| tree | 77e41350cb98db3c5b181532d02c69f8fbad598f /~xihh/muscle/LICENSE | |
| parent | fb8b936c2a92c0d645a460202c87c0a24569991e (diff) | |
| parent | ef17357a9745e05e301b724d13a341067ddb3d5b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
community/geany-plugins/PKGBUILD
community/kyotocabinet/PKGBUILD
community/sysstat/PKGBUILD
core/openldap/PKGBUILD
Diffstat (limited to '~xihh/muscle/LICENSE')
0 files changed, 0 insertions, 0 deletions