diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
| commit | 4a534f68f38c221a2276fa791e086c3848ce515d (patch) | |
| tree | 7963845c02cde2b1f4a4fb8a6c6cfa497b5ee5d5 /extra/bluefish | |
| parent | d5acc51bdb801d2bb930af53220946e739dd5edd (diff) | |
| parent | 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/calibre/PKGBUILD
community/ffmpeg2theora/PKGBUILD
core/e2fsprogs/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/ffmpeg/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
staging/transcode/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/bluefish')
0 files changed, 0 insertions, 0 deletions