diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-22 10:28:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-22 10:28:18 +0100 |
| commit | 89da12a4917a580d24a76582283195a364de5d2c (patch) | |
| tree | 239bdb76d33dae8ad8ad5406e0db27925862fe5a /extra/compface | |
| parent | 4199888a832fe0d15a95ab2bd60ae5d4957f86c0 (diff) | |
| parent | 0ab7960ba6a457b7dd3ed5ede0cdb93e816d29a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/easytag/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/openmpi/PKGBUILD
extra/potrace/PKGBUILD
extra/ptlib/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/compface')
0 files changed, 0 insertions, 0 deletions