Merge branch 'master' into new_panels_with_context_buttons
[situare] / src / error.h
2010-08-09 Sami RämöRe-factoring, created error.h, clean-up