diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-12 09:22:17 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-12 09:22:17 +0100 |
| commit | a21571d0234872303afffe134f6c647ad2111b20 (patch) | |
| tree | a96dae8d65bd3fe7848accb01f4bdb5584f7c551 /core/glib2 | |
| parent | 9dd0d82aa6daca172465dcf7e17f95090b24ccc1 (diff) | |
| parent | 29b0da64a462b6c5f6871b08e344b3ffa59cbd0a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-tar/PKGBUILD
extra/fbida/PKGBUILD
extra/kdesdk-kate/PKGBUILD
Diffstat (limited to 'core/glib2')
0 files changed, 0 insertions, 0 deletions