diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-30 12:41:17 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-30 12:41:17 -0300 |
commit | e68d976a35ac019eaad2d80b2818748211176d5b (patch) | |
tree | 716c653396b08e05e12b6acc97d06bb7cb9fd72c /libre/virtualbox-libre/vboxweb.rc | |
parent | e855f30d427d16dc9b9eada81e48c6acd2400793 (diff) | |
parent | 35c8fd0c42370098fe43db71c93aa22b4d41507b (diff) | |
download | abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.tar.gz abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.tar.bz2 abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts:
libre/your-freedom/PKGBUILD
Diffstat (limited to 'libre/virtualbox-libre/vboxweb.rc')
0 files changed, 0 insertions, 0 deletions