omicron sketch
omicron: support for panning and zooming, export/import.
omicron: Proper multisampling.
move
move
Merge branch 'master' of github.com:avakar/Lorris into omicron

Conflicts:
	src/src.pro
Fixed connect in omicron, after breaking chang in pct types.
A bunch of fixes for lorrisomicron
Merge branch 'master' of github.com:avakar/Lorris into omicron

Conflicts:
	src/connection/shupitoconn.cpp
	src/connection/shupitoconn.h
	src/src.pro
Fixed build after merge.
Merge branch 'omicron' of github.com:avakar/Lorris into omicron2

Conflicts:
	src/misc/config.cpp
	src/misc/config.h
omicron: starting, stopping, channel manipulation, continuous upload