Commit af78d140 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' into v2.1 

I had to remove the postproc.sh file added in v2.0
to post-process html files (in v2.1 this is done in go-doxygen)

Conflicts:
	user-doc/Makefile
parents 5a2234b5 f0a2bcd6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment