Michael Nilsson 0d49076c54 solve merge conflict with develop

2016-05-03 17:11:28 -04:00

..

ccmc_lab_all.xml

Added variable stepsize for volumes

2014-07-01 10:01:54 -04:00

ccmc_lab_work.xml

Added variable stepsize for volumes

2014-07-01 10:01:54 -04:00

single_fisheye.xml

Set correct window name in Single and fisheye configuration files

2016-05-01 13:39:26 +02:00

single_sbs_stereo.xml

Fix single side-by-side stereo configuration file

2015-04-07 00:08:53 +02:00

single_stereo.xml

…

single_two_win.xml

request file extension

2016-04-01 16:32:18 -04:00

single.xml

Set correct window name in Single and fisheye configuration files

2016-05-01 13:39:26 +02:00

two_nodes.xml

Fixed crash for secondary node

2014-05-22 13:50:35 -04:00

VRArenaSimCenter.xml

…