forked from M-Labs/artiq
Compare commits
merge into: srenblad:interactive_args_error_on_concurrent_access
srenblad:master
srenblad:flashing_idle_kernel_fix
srenblad:analyzer_memory
srenblad:fastino_moninj_support
srenblad:comm_analyzer_urukul_support
srenblad:moninj_fixed_size_widgets
srenblad:moninj_dac_widget_improvements
srenblad:allow_setattr_override
srenblad:moninj_multi_docks
srenblad:moninj_widgets_to_handlers
srenblad:moninj_router_design
srenblad:moninj_configuration_files
srenblad:moninj_convert_to_tree
srenblad:moninj_redesign_widgets
srenblad:moninj_widgets_add_channel_dialog
srenblad:moninj_alter_description
srenblad:moninj_gui_overhaul
srenblad:interactive_args_error_on_concurrent_access
srenblad:interactive_args_cancellation
srenblad:fix_dict_sync_model
srenblad:unify_argeditors_entry_tree
srenblad:interactive_args_enum_value
srenblad:interactive_args_dashboard
srenblad:hde_waveform_add_cursor
srenblad:hde_waveform_create_wform
srenblad:hde_waveform_plot_vector
srenblad:hde_waveform_plot_log
srenblad:hde_waveform_plot_analog
srenblad:hde_waveform_plot_bit
srenblad:hde_waveform_plot_base
srenblad:hde_waveform_view
srenblad:hde_waveform_save_trace
srenblad:hde_waveform_waveform_model
srenblad:hde_testing
srenblad:hde_waveform_add_channel_dialog
srenblad:hde_log_channels_fix
srenblad:hde_waveform_proxies
srenblad:hde_waveform_base
srenblad:hde_dnd_widgets
srenblad:hde_comm_analyzer_missing_call
srenblad:hde_analyzer_proxy_receiver
srenblad:hde_comm_analyzer_decode_from_receiver
srenblad:hde_comm_analyzer_channel_only_mgr
srenblad:hde_waveform_comm_analyzer
srenblad:hde_save_file_name
srenblad:hde_waveform_dock
srenblad:release-7
srenblad:nac3
srenblad:release-6
srenblad:almazny-1v2
srenblad:syncrtio
srenblad:release-5
srenblad:datasets
srenblad:suservo-oxford
srenblad:release-4
srenblad:release-3
srenblad:fix-scanwidget-size
srenblad:rust-1.28
srenblad:new-openocd
srenblad:release-2
srenblad:release-1
srenblad:old/phaser2
srenblad:old/phaser1
srenblad:7.0
srenblad:6.0
srenblad:5.0
srenblad:5.0.dev
srenblad:4.0
srenblad:3.7
srenblad:3.6
srenblad:3.5
srenblad:3.4
srenblad:3.3
srenblad:3.2
srenblad:3.1
srenblad:2.5
srenblad:4.0.dev
srenblad:3.0
srenblad:2.4
srenblad:2.3
srenblad:2.2
srenblad:2.1
srenblad:2.0
srenblad:2.0rc2
srenblad:2.0rc1
srenblad:3.0.dev
srenblad:1.3
srenblad:1.2
srenblad:1.1
srenblad:1.0
srenblad:1.0rc4
srenblad:1.0rc3
srenblad:1.0rc2
srenblad:2.0.dev
srenblad:1.0rc1
srenblad:0.1
srenblad:0.0
M-Labs:5.0
M-Labs:4.0
M-Labs:3.7
M-Labs:3.6
M-Labs:3.5
M-Labs:3.4
M-Labs:3.3
M-Labs:3.2
M-Labs:3.1
M-Labs:2.5
M-Labs:3.0
M-Labs:2.4
M-Labs:2.3
M-Labs:2.2
M-Labs:2.0
M-Labs:2.0rc2
M-Labs:2.0rc1
M-Labs:1.3
M-Labs:1.0
M-Labs:0.1
M-Labs:0.0
M-Labs:1.0rc1
M-Labs:1.0rc2
M-Labs:1.0rc3
M-Labs:1.0rc4
M-Labs:1.1
M-Labs:1.2
M-Labs:2.0.dev
M-Labs:2.1
M-Labs:3.0.dev
M-Labs:4.0.dev
M-Labs:5.0.dev
M-Labs:6.0
M-Labs:7.0
M-Labs:8.0
pull from: srenblad:master
srenblad:flashing_idle_kernel_fix
srenblad:analyzer_memory
srenblad:fastino_moninj_support
srenblad:comm_analyzer_urukul_support
srenblad:moninj_fixed_size_widgets
srenblad:moninj_dac_widget_improvements
srenblad:allow_setattr_override
srenblad:moninj_multi_docks
srenblad:moninj_widgets_to_handlers
srenblad:moninj_router_design
srenblad:moninj_configuration_files
srenblad:moninj_convert_to_tree
srenblad:moninj_redesign_widgets
srenblad:moninj_widgets_add_channel_dialog
srenblad:moninj_alter_description
srenblad:moninj_gui_overhaul
srenblad:interactive_args_error_on_concurrent_access
srenblad:interactive_args_cancellation
srenblad:fix_dict_sync_model
srenblad:unify_argeditors_entry_tree
srenblad:interactive_args_enum_value
srenblad:interactive_args_dashboard
srenblad:hde_waveform_add_cursor
srenblad:hde_waveform_create_wform
srenblad:hde_waveform_plot_vector
srenblad:hde_waveform_plot_log
srenblad:hde_waveform_plot_analog
srenblad:hde_waveform_plot_bit
srenblad:hde_waveform_plot_base
srenblad:hde_waveform_view
srenblad:hde_waveform_save_trace
srenblad:hde_waveform_waveform_model
srenblad:hde_testing
srenblad:hde_waveform_add_channel_dialog
srenblad:hde_log_channels_fix
srenblad:hde_waveform_proxies
srenblad:hde_waveform_base
srenblad:hde_dnd_widgets
srenblad:hde_comm_analyzer_missing_call
srenblad:hde_analyzer_proxy_receiver
srenblad:hde_comm_analyzer_decode_from_receiver
srenblad:hde_comm_analyzer_channel_only_mgr
srenblad:hde_waveform_comm_analyzer
srenblad:hde_save_file_name
srenblad:hde_waveform_dock
srenblad:release-7
srenblad:master
srenblad:nac3
srenblad:release-6
srenblad:almazny-1v2
srenblad:syncrtio
srenblad:release-5
srenblad:datasets
srenblad:suservo-oxford
srenblad:release-4
srenblad:release-3
srenblad:fix-scanwidget-size
srenblad:rust-1.28
srenblad:new-openocd
srenblad:release-2
srenblad:release-1
srenblad:old/phaser2
srenblad:old/phaser1
M-Labs:release-8
M-Labs:master
M-Labs:release-7
M-Labs:nac3
M-Labs:release-6
M-Labs:release-5
M-Labs:datasets
M-Labs:release-4
M-Labs:release-3
M-Labs:fix-scanwidget-size
M-Labs:rust-1.28
M-Labs:release-2
M-Labs:release-1
srenblad:7.0
srenblad:6.0
srenblad:5.0
srenblad:5.0.dev
srenblad:4.0
srenblad:3.7
srenblad:3.6
srenblad:3.5
srenblad:3.4
srenblad:3.3
srenblad:3.2
srenblad:3.1
srenblad:2.5
srenblad:4.0.dev
srenblad:3.0
srenblad:2.4
srenblad:2.3
srenblad:2.2
srenblad:2.1
srenblad:2.0
srenblad:2.0rc2
srenblad:2.0rc1
srenblad:3.0.dev
srenblad:1.3
srenblad:1.2
srenblad:1.1
srenblad:1.0
srenblad:1.0rc4
srenblad:1.0rc3
srenblad:1.0rc2
srenblad:2.0.dev
srenblad:1.0rc1
srenblad:0.1
srenblad:0.0
M-Labs:5.0
M-Labs:4.0
M-Labs:3.7
M-Labs:3.6
M-Labs:3.5
M-Labs:3.4
M-Labs:3.3
M-Labs:3.2
M-Labs:3.1
M-Labs:2.5
M-Labs:3.0
M-Labs:2.4
M-Labs:2.3
M-Labs:2.2
M-Labs:2.0
M-Labs:2.0rc2
M-Labs:2.0rc1
M-Labs:1.3
M-Labs:1.0
M-Labs:0.1
M-Labs:0.0
M-Labs:1.0rc1
M-Labs:1.0rc2
M-Labs:1.0rc3
M-Labs:1.0rc4
M-Labs:1.1
M-Labs:1.2
M-Labs:2.0.dev
M-Labs:2.1
M-Labs:3.0.dev
M-Labs:4.0.dev
M-Labs:5.0.dev
M-Labs:6.0
M-Labs:7.0
M-Labs:8.0
These branches are equal. There is no need to create a pull request.