Merge branch 'pkahle'
commitf4ae40c72b7efad52e9a78074050400c0464ba6b
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 25 May 2010 13:06:00 +0000 (25 15:06 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 25 May 2010 13:06:00 +0000 (25 15:06 +0200)
treee1391345f357affe1b95aabcba93af4da2b28d28
parentf6f0f696b6207b4612b92940a9fe5557bc96de12
parent209020952f61f425e0ddeb0230bcb8c16c9ad6a0
Merge branch 'pkahle'
explorer/Makefile