Merge branches 'screenscalehack' and 'bugfixes' into 3.1
authorCyp <cyp@wz2100.net>
Tue, 19 Jun 2012 07:42:52 +0000 (09:42 +0200)
committerCyp <cyp@wz2100.net>
Tue, 19 Jun 2012 07:42:52 +0000 (09:42 +0200)
commit5c1e204e78bba98585336cc2eae93e1ad3d302ec
treec5eab73dd845e8e4784458fa1dc7428f107e0408
parent02395b3f02589a7a908cb7cddfaaf5248fdd8d23
parentd697c42d9cfde492fbcf4bef6a02676a9308b6d0
parent205609302755ec151d4768da6cdcefe768059fb1
Merge branches 'screenscalehack' and 'bugfixes' into 3.1

Conflicts with 'bugfixes':
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/clparse.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/clparse.cpp
src/configuration.cpp