« Previous | Next » 

Revision 057f18bf

ID057f18bf8061daeb58528d9cca73204bcb255eb5
Parent 60ed2de8, bd934be4
Child 0896c774

Added by Ruben S. Montero over 10 years ago

Merge branch 'one-2.0'

Conflicts:
install.sh
src/im_mad/im_sh/one_im_sh
src/vmm_mad/ssh/one_vmm_ssh
src/vmm_mad/ssh/vmm_sshrc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted