« Previous | Next » 

Revision 0e2849b6

ID0e2849b645c4754b0c7e34018970cdd8ca0122e1
Parent eb5ce07c, 987f833b
Child 6c21529a

Added by Ruben S. Montero about 8 years ago

Merge branch 'master' into feature-1791

Conflicts:
include/LifeCycleManager.h
include/VirtualMachine.h
src/lcm/LifeCycleActions.cc
src/lcm/LifeCycleManager.cc
src/lcm/LifeCycleStates.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted