diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 20:37:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 20:37:04 -0300 |
| commit | a379247a5f187c1608664530e9ff85663eff3201 (patch) | |
| tree | 3a49e87e7419c4aca35d1f4f2e591d12c3821c78 /extra/capi4hylafax/capi4hylafax.rc | |
| parent | 1bf114d00280c9cfb2075d30830fdf86adb30951 (diff) | |
| parent | 81ee1980feda43043eaebae2c596ae116a21f6e5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cuetools/PKGBUILD
community/ekg2/PKGBUILD
community/libcss/PKGBUILD
community/libwapcaplet/PKGBUILD
community/lxrandr/PKGBUILD
community/menu-cache/PKGBUILD
community/mumble/PKGBUILD
community/ngircd/PKGBUILD
community/oidentd/PKGBUILD
community/openbox/PKGBUILD
community/preload/PKGBUILD
community/xdg-user-dirs/PKGBUILD
extra/gdome2/PKGBUILD
extra/libdiscid/PKGBUILD
extra/pymad/PKGBUILD
extra/qhull/PKGBUILD
extra/speech-dispatcher/PKGBUILD
multilib/lib32-gmp/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/capi4hylafax/capi4hylafax.rc')
0 files changed, 0 insertions, 0 deletions