diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-16 22:03:54 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-16 22:03:54 +0100 |
| commit | d503056ff0810f0e9a4d7430dd9a99ef666240d9 (patch) | |
| tree | ce61331f893f95b1d3ae90eb3ea8e00adf2aa546 /community/gcompris | |
| parent | 0f2c3b17c081339b0c78fc54aa64a13a6b7e7c6e (diff) | |
| parent | 99c34471cedb5de3afae4e33c48239abbe1410c7 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk-engine-unico/PKGBUILD
community/libfm/PKGBUILD
community/lxlauncher/PKGBUILD
community/lxpanel/PKGBUILD
community/ncmpcpp/PKGBUILD
community/sshguard/PKGBUILD
Diffstat (limited to 'community/gcompris')
0 files changed, 0 insertions, 0 deletions