inc/dg/Makefile
merge conflicts
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
changed Makefile for innto_hpc
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Makefile adaption in diag
generator
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
generator Makefile
fixed Makefile conflicts
removed typename in innto_hw
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/toefl into develop