diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-16 09:33:55 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-16 09:33:55 +0100 |
| commit | ac7ae9021d3c01f462af68beacb77bd8c7b7e003 (patch) | |
| tree | 6e8b2404ab0e479a51e6803879ba259ec9785a3b /community/discid | |
| parent | 056dabfc0e406e939dfb9ce70e2c2e6de95c3ba1 (diff) | |
| parent | ea60830c19f04f36803e26821bd9db1361489653 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/me-tv/PKGBUILD
core/systemd/PKGBUILD
libre/linux-libre/PKGBUILD
pcr/opentracker/opentracker.rc.d
Diffstat (limited to 'community/discid')
0 files changed, 0 insertions, 0 deletions