diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
| commit | 3282ccb6286f172872d887baf49e623c51e0a157 (patch) | |
| tree | 73ddd891395a089f724fd9cbcb95c6a28e1ffcce /extra/rox/rox.svg | |
| parent | f22839d3ad483a975a0c5955964bf257c0a0af6b (diff) | |
| parent | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vbox-service.rc
community-testing/virtualbox/vboxdrv-reference.patch
core/cryptsetup/PKGBUILD
core/ed/PKGBUILD
core/module-init-tools/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'extra/rox/rox.svg')
0 files changed, 0 insertions, 0 deletions