Merge branch 'work/innosetup' into devel
commit61bc6d5ba5aafd397ebc92b736476e8a59accafb
authorSteffen Prohaska <prohaska@zib.de>
Sun, 13 Jan 2008 14:35:57 +0000 (13 15:35 +0100)
committerSteffen Prohaska <prohaska@zib.de>
Sun, 13 Jan 2008 14:35:57 +0000 (13 15:35 +0100)
tree0360c0628eb75b3ccf02be24b6010286a9d9288d
parentf08f398ba3fbbf52a6a3eafb8f537d15efff5d8a
parent7d5594da896e5f505cceaf3af942faafe1f7c702
Merge branch 'work/innosetup' into devel