diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-20 10:27:42 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-20 10:27:42 +0100 |
| commit | 510e46e27a20e01134b2a7a8da3774336cf279aa (patch) | |
| tree | f509ce61848fcfc0ef72c8dfe3528062e0045032 /~xihh/couchdb-git | |
| parent | 855edb52bd8eb32bb11173a398fa09c1341dc165 (diff) | |
| parent | 1bd47d3e04c409582486ea3ec915d3b7899f6841 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/linux-tools/PKGBUILD
community/projectm/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
libre/linux-libre-tools/PKGBUILD
Diffstat (limited to '~xihh/couchdb-git')
0 files changed, 0 insertions, 0 deletions