« Previous | Next » 

Revision 1ac75db4

ID1ac75db498aa0483591f66ab4b8a427c7899f055
Parent 2e42a4f1, e53f40bd
Child 7fafad8f

Added by Filippos Giannakos over 11 years ago

Merge branch 'feature-modulartools' into debian-feature-modulartools

Conflicts:
devflow.conf
xseg/sys/user/python/setup.py
xseg/tools/archipelago/Makefile
xseg/tools/archipelago/archipelago/archipelago.py
xseg/tools/archipelago/archipelago/vlmc.py
xseg/tools/archipelago/setup.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted