« Previous | Next » 

Revision c3f29585

IDc3f295850330ab88df822521fb995d27f596ce9d

Added by Constantinos Venetsanopoulos over 11 years ago

Merge branch 'grnet-2.7-esi-devel' into 2.6rc3+grnet

Minor fixes in conflicts

Conflicts:
Makefile.am
lib/constants.py

Signed-off-by: Constantinos Venetsanopoulos <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted