Merge branch 'hotfix-v0.2.8'
changes for compatibility with Pathscale compiler
Merge remote branch 'origin/develop' into bulldozer
merged form develop
Merge remote branch 'origin/develop' into bulldozer
changed level3.c
modified common.h
Merge remote branch 'origin/develop' into bulldozer
Merge remote branch 'origin/master' into bulldozer
Merge remote branch 'origin/develop' into bulldozer
modified param.h
Merge remote branch 'origin/bulldozer' into develop