Merge branch 'rotation-4-5' into rotation
commit471986d4079bce6030da85e53badcc7a750c58be
authorCarsten Kutzner <ckutzne@gwdg.de>
Thu, 4 Nov 2010 10:51:56 +0000 (4 11:51 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Thu, 4 Nov 2010 10:51:56 +0000 (4 11:51 +0100)
tree1e0cf20191007f2059a7b7a21a8d831efa45df44
parent40df96b42ef273bdde46788f43e792a3885808bf
parent1f146791d29372a17092cdb7d26525385eaac01d
Merge branch 'rotation-4-5' into rotation

Conflicts:
src/tools/Makefile.am
include/string2.h
include/vec.h
src/kernel/CMakeLists.txt
src/tools/CMakeLists.txt