Dhanya Maliakal 28e2ebf75a merge conflict resolved from 3.0.1

2017-11-17 09:40:42 +01:00

..

form_action.ui

included images

2012-09-07 16:29:32 +00:00

form_detectormain.ui

form used ampersand

2013-07-12 12:44:23 +00:00

form_scan.ui

changed the tab order for the forms

2013-05-15 13:07:07 +00:00

form_tab_advanced.ui

including zmq port change in gui

2017-11-16 13:50:30 +01:00

form_tab_dataoutput.ui

removed compression from gui in expert mode

2017-11-13 15:32:24 +01:00

form_tab_debugging.ui

changed the tab order for the forms

2013-05-15 13:07:07 +00:00

form_tab_measurement.ui

allowing -1 in gui for spinbox

2017-08-04 14:20:51 +02:00

form_tab_messages.ui

created messages tab-not working completely yet

2012-06-28 08:35:21 +00:00

form_tab_plot.ui

gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix

2017-09-01 12:03:09 +02:00

form_tab_settings.ui

added 2 gain settings to eigeR

2016-08-03 10:34:10 +02:00