diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
| commit | 8a3d4ee5105eefa2136eb7ae83e69d01f29864c3 (patch) | |
| tree | 8be9a06d3b2d8cade4b5dba48e040c632bd33850 /community/tremulous/tremulous.launcher | |
| parent | 404b7ff94ece6bb2ce0e9df042ac1fe798137c83 (diff) | |
| parent | d1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/zathura/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libdvdread/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/postgresql/PKGBUILD
Diffstat (limited to 'community/tremulous/tremulous.launcher')
0 files changed, 0 insertions, 0 deletions