diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
| commit | ad63cdb5324392490de7e1f70ad3256ebf32603d (patch) | |
| tree | cd8e31855114a730c3901f80e341c2f4486ba473 /extra/telepathy-butterfly/PKGBUILD | |
| parent | 8288f4022c5673fa36117598c7e7a3f6c2dfb1e2 (diff) | |
| parent | f0fa42126da9e3eec6b98388b35c67929fa20dae (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/radvd/PKGBUILD
extra/samba/PKGBUILD
extra/tftp-hpa/PKGBUILD
libre/linux-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/sudo/PKGBUILD
Diffstat (limited to 'extra/telepathy-butterfly/PKGBUILD')
0 files changed, 0 insertions, 0 deletions