Changeset 7ad992c


Ignore:
Timestamp:
Jul 8, 2013 12:46:14 PM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
a0f10e7
Parents:
4930125 (diff), dae2bf54 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/misc/pcbsd-base/Makefile

    r796a591 r5e1ad95  
    126126                vi-aspell>=0:${PORTSDIR}/vietnamese/aspell \ 
    127127                mosh:${PORTSDIR}/net/mosh \ 
     128                virtualbox-ose>=0:${PORTSDIR}/emulators/virtualbox-ose \ 
     129                virtualbox-ose-kmod>=0:${PORTSDIR}/emulators/virtualbox-ose-kmod \ 
     130                virtualbox-ose-additions>=0:${PORTSDIR}/emulators/virtualbox-ose-additions \ 
    128131                grub-mkconfig:${PORTSDIR}/sysutils/grub2 
    129132 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header

    r47f2308 r4930125  
    288288    set timeout=-1 
    289289  else 
    290     set timeout=${2} 
     290    set timeout=0 
    291291  fi 
    292292fi 
Note: See TracChangeset for help on using the changeset viewer.