win32/wl4 fixes
Merge branch 'master' of https://github.com/Eyescale/Equalizer
fixed some more wl4 warnings
Merge branch 'master' of https://github.com/tribal-tec/Equalizer
make initCanvas callable multiple times
for manually adding channels to the config after parsing
Merge pull request #215 from tribal-tec/master

Fix initial commandline parsing for render clients
Merge branch 'master' of https://github.com/rttag/Equalizer

Conflicts:
	eq/client/glWindow.cpp
Merge cleanups
Doxygen fix
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Fix build w/ self-built OpenCV