diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
| commit | fb5b6b28f363547abcbfa026fcae050236861425 (patch) | |
| tree | 850e29f1f9f42ada20e1c6818316988505970dae /extra/vcdimager/PKGBUILD | |
| parent | 67eabbfbd9364ee57f122c9ec9a03dd61bba850b (diff) | |
| parent | ab63d8d49f68847a68c2ba0014bf0d3338cb3df6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
community/mplayer2/PKGBUILD
community/nginx/PKGBUILD
community/pidgin-libnotify/PKGBUILD
core/util-linux/PKGBUILD
extra/aspell-pt/PKGBUILD
extra/glpk/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/texmacs/PKGBUILD
Diffstat (limited to 'extra/vcdimager/PKGBUILD')
0 files changed, 0 insertions, 0 deletions