Merge /fml/ag-raetsch/home/maan/scm/paraslash/ into my-osx
authorAndre Noll <maan@congo.fml.local>
Fri, 11 Aug 2006 15:01:36 +0000 (17:01 +0200)
committerAndre Noll <maan@congo.fml.local>
Fri, 11 Aug 2006 15:01:36 +0000 (17:01 +0200)
1  2 
error.h

diff --cc error.h
Simple merge