Commit Graph

Select branches

Hide Pull Requests

10.0.1.rc

1001/python_cmd_for_ROI

802/anna_fixes

802/fix_hdf5_fillvalue

anna

ctbgatedclk

debugInterpolation

dev/add_simulator_tests_in_github_workflows

dev/add_simulator_tests_in_github_workflows_fix

dev/automate_documentation_build

dev/dbitorder

dev/fix/test_frame_synchronizer_write_error_to_log_file

dev/fix_m3_hdf5_master_file_time_arrays

dev/generate

dev/xilinx_power

developer

fix/const

fix/pattern

fix/pyfixture_test

fix/remove-writeDataFile

fix/setbit_not_backwardscompatible_in_python

g2rxrgui

gh-pages

jf_h5reader

jf_json_rxroi

kp_highZ

main

moench

moench8.0.2.rc

patrick_250211

rosenblatt

rr_rxr

separateRxr

split-listener

#1

#10

#100

#1000

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#101

#1010

#1011

#1013

#1014

#1015

#1017

#1018

#1019

#102

#1020

#1023

#1024

#1025

#1027

#1029

#103

#1030

#1031

#1034

#1037

#1038

#1039

#104

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#105

#1050

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1064

#1065

#1066

#1069

#107

#1071

#1074

#1076

#1078

#1079

#108

#1082

#1084

#1086

#1089

#109

#1090

#1092

#1093

#1094

#1096

#1097

#1098

#1099

#11

#110

#1100

#1101

#1106

#1107

#1108

#111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1119

#112

#1120

#1123

#1125

#1126

#1127

#113

#1130

#1131

#1133

#1136

#1137

#114

#1140

#1141

#1142

#1143

#1145

#1148

#1149

#115

#1157

#1158

#1159

#116

#1162

#1163

#1164

#1165

#1167

#117

#1176

#1177

#1178

#1179

#118

#1181

#1184

#1186

#1188

#1189

#1190

#1193

#1194

#1195

#1199

#12

#120

#1200

#1201

#1202

#1205

#1206

#1207

#1209

#121

#1211

#1212

#1213

#1214

#1215

#1216

#1217

#1219

#122

#1221

#1223

#1224

#1225

#1226

#1227

#1228

#123

#1230

#1232

#1233

#1237

#1239

#124

#1242

#1245

#1247

#125

#1250

#1252

#1253

#1255

#1256

#1257

#1258

#1259

#126

#1260

#1262

#1263

#1264

#1265

#1266

#1267

#1268

#1269

#127

#1271

#1272

#1273

#1274

#1275

#1276

#1277

#1278

#1279

#128

#1280

#1281

#1282

#1285

#1286

#1287

#1289

#129

#1290

#1291

#1292

#1293

#1294

#1295

#1298

#1299

#13

#1301

#1303

#1306

#1307

#1309

#1311

#1312

#1313

#1315

#1316

#1318

#1320

#1321

#1324

#1326

#1327

#1328

#1330

#1332

#1333

#1335

#1337

#1337

#1338

#1339

#1342

#1343

#1344

#1346

#1346

#1347

#1348

#1348

#1350

#1350

#1351

#1352

#1353

#1353

#1355

#1355

#1357

#1357

#1358

#1358

#1359

#14

#140

#141

#147

#149

#15

#150

#152

#156

#157

#159

#16

#163

#164

#166

#167

#168

#17

#170

#171

#173

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#186

#188

#189

#19

#190

#191

#193

#196

#199

#2

#20

#200

#201

#203

#204

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#218

#22

#221

#222

#223

#225

#226

#227

#228

#229

#23

#231

#232

#235

#237

#24

#242

#246

#247

#248

#25

#250

#252

#254

#256

#259

#26

#264

#265

#267

#268

#269

#27

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#329

#33

#330

#331

#332

#333

#334

#335

#339

#34

#340

#343

#344

#346

#347

#349

#35

#354

#355

#357

#358

#359

#36

#361

#362

#368

#37

#371

#373

#375

#376

#378

#379

#38

#384

#386

#388

#39

#390

#391

#395

#396

#397

#398

#4

#40

#401

#407

#408

#409

#41

#411

#413

#414

#418

#419

#42

#420

#421

#423

#425

#427

#428

#429

#43

#430

#431

#435

#436

#439

#44

#440

#443

#444

#445

#447

#449

#45

#450

#452

#453

#454

#457

#46

#460

#461

#462

#463

#464

#465

#466

#47

#470

#475

#477

#479

#48

#480

#481

#482

#483

#484

#485

#487

#49

#490

#492

#493

#495

#496

#498

#499

#50

#501

#502

#503

#504

#505

#506

#507

#508

#51

#510

#512

#514

#516

#518

#519

#52

#521

#522

#524

#526

#53

#535

#536

#54

#541

#542

#544

#545

#547

#548

#55

#550

#551

#552

#553

#554

#555

#556

#557

#559

#56

#560

#561

#562

#563

#565

#566

#567

#568

#569

#57

#570

#571

#573

#574

#576

#577

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#590

#591

#594

#595

#596

#597

#6

#60

#601

#602

#603

#604

#606

#609

#61

#613

#615

#618

#619

#62

#620

#621

#623

#625

#628

#629

#63

#632

#636

#637

#638

#639

#64

#642

#643

#644

#646

#647

#649

#65

#653

#655

#656

#658

#659

#66

#662

#665

#667

#669

#67

#673

#674

#68

#680

#681

#683

#684

#685

#686

#687

#688

#69

#690

#691

#693

#694

#696

#697

#698

#699

#7

#70

#700

#701

#702

#703

#705

#706

#708

#709

#71

#710

#713

#714

#715

#716

#717

#719

#72

#721

#722

#723

#724

#725

#726

#728

#729

#73

#731

#732

#736

#737

#738

#739

#74

#740

#741

#742

#743

#745

#746

#747

#75

#750

#751

#753

#755

#756

#757

#759

#76

#761

#764

#766

#767

#768

#769

#770

#772

#773

#774

#775

#776

#777

#779

#780

#782

#784

#786

#787

#788

#789

#79

#790

#791

#792

#794

#796

#797

#8

#80

#802

#803

#805

#807

#81

#810

#812

#813

#814

#815

#816

#817

#818

#819

#82

#820

#821

#822

#823

#824

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#84

#841

#842

#846

#847

#848

#85

#850

#851

#852

#853

#854

#855

#856

#857

#859

#86

#860

#861

#862

#864

#865

#866

#867

#869

#87

#870

#871

#872

#873

#875

#876

#877

#878

#879

#88

#880

#881

#882

#884

#886

#887

#888

#89

#891

#892

#893

#895

#898

#9

#90

#900

#901

#907

#908

#909

#91

#910

#911

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#931

#933

#935

#936

#94

#940

#942

#943

#944

#946

#947

#948

#949

#95

#951

#952

#953

#954

#956

#957

#958

#959

#96

#960

#962

#963

#966

#968

#969

#97

#970

#972

#973

#974

#975

#979

#98

#980

#982

#983

#985

#987

#988

#99

#990

#991

#992

#993

#994

#995

#996

#999

10.0.0

2.0.5

2.1.0

2.1.1

2.2.0

2.3.0

2.3.1

2.3.2

2.3.3

2.3.4

2020.03.02.dev0

2020.03.06.dev0

2020.03.11.dev0

2020.03.17dev0

2020.03.18dev0

2020.03.18dev1

2020.03.18dev2

2020.04.01.dev0

2020.04.07.dev0

2020.04.08.dev0

2020.04.08.dev1

2020.04.23.dev0

2020.05.08.dev0

2020.06.08.dev0

2020.07.23.dev0

2020.08.10.dev0

2020.08.12.dev0

2020.09.09.dev0

2020.09.11.dev0

2020.09.17.dev0

2020.09.24.dev0

2020.09.24.dev1

2020.09.25.dev0

2020.10.05.dev0

2020.10.12.dev0

2020.10.28.dev0

2020.11.02.dev0

2020.11.09.dev0

2020.11.09.dev1

2021.01.14.dev0

2021.01.20.dev0

2021.01.26.dev0

2021.5.10.dev0

2022.04.04.dev0

2022.05.10.dev0

2022.05.10.dev1

2022.05.12.dev0

2022.05.22.dev0

2022.06.07.dev0

2022.07.06.dev0

2022.2.23.dev0

2022.2.3.dev0

2023.03.13.dev0

2023.03.16.dev1

3.0.0

3.0.1

3.1.0

3.1.1

3.1.2

3.1.3

3.1.4

3.1.5

4.0.0

4.0.1

4.0.2

4.1.0

4.1.1

4.2.0

5.0.0

5.0.0-rc1

5.0.0-rc2

5.0.0.rc2

5.0.1

5.1.0

5.1.0.rc1

5.1.0.rc2

5.1.0.rc3

6.0.0

6.0.0-rc1

6.1.0

6.1.1

6.1.2

7.0.0

7.0.0.rc1

7.0.0.rc2

7.0.0.rc3

7.0.0.rc4

7.0.1

7.0.2

7.0.3

8.0.0

8.0.1

8.0.2

9.0.0

9.1.0

9.1.1

9.2.0

ctb1.0

gotthardDoubleModule

jungfrau_draft_2.0

moenchv0.1

olddeveloper

sophieesrf

Mono Color

• f264691dc1 renamed sebastians interpolation - must be edited to avoid root Anna Bergamaschi 2018-01-18 18:08:55 +01:00
• 3854c82b90 added iterative interpolation Anna Bergamaschi 2018-01-18 18:07:58 +01:00
• 92b4b3324e first mythen3 server commit Andrä Marie 2018-01-18 09:25:06 +01:00
• ac536ebdf7 cluster finder for phoenix data (i.e. old raw data format) Anna Bergamaschi 2018-01-15 11:52:28 +01:00
• 061abf7be0 jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up Dhanya Maliakal 2018-01-11 16:52:08 +01:00
• 2d6e4c95a2 temp_threshold, temp_control, temp_event done Dhanya Maliakal 2018-01-11 15:37:24 +01:00
• a87687199f jungfrau server: minor typo in previous ocmmit Dhanya Maliakal 2018-01-11 11:36:40 +01:00
• d879379aa4 jungfrau server: incorporated transmission delay Dhanya Maliakal 2018-01-11 11:33:26 +01:00
• 8fc3d97e78 jungfrau server: changed delay to trigger delay to have better trigger being caught Dhanya Maliakal 2018-01-11 09:26:50 +01:00
• beabd03be2 jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd Dhanya Maliakal 2018-01-11 09:24:36 +01:00
• 348a426242 updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date Dhanya Maliakal 2018-01-11 09:14:45 +01:00
• 68d6c514a9 jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled Dhanya Maliakal 2018-01-10 15:49:40 +01:00
• 834794ad98 gotthard renamed binaries Dhanya Maliakal 2017-12-19 18:04:44 +01:00
• 59c0861131 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-19 17:51:31 +01:00
• 6690335971 gotthard server bug fix, temp read Dhanya Maliakal 2017-12-19 17:50:20 +01:00
• bc8c706150 updated gotthard server binaries (3.0.0.6 was already used in 3.0.1) Dhanya Maliakal 2017-12-19 17:44:32 +01:00
• e39bee0113 gotthard server bug fix, temp fail Dhanya Maliakal 2017-12-19 17:33:27 +01:00
• a4dc00b252 gotthard server binary update Dhanya Maliakal 2017-12-19 17:08:28 +01:00
• 6438238b55 gotthard server bug fix, read temp Dhanya Maliakal 2017-12-19 17:06:45 +01:00
• 31589ce352 added and fixed gotthard 25um file and zmq photon finder Anna Bergamaschi 2017-12-19 13:40:05 +01:00
• 7602ffc5ac gotthard on the fly to be stested Anna Bergamaschi 2017-12-14 17:01:28 +01:00
• 13078d0ef2 gotthardDataStructures added Anna Bergamaschi 2017-12-14 17:00:30 +01:00
• 9f3468bd15 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Anna Bergamaschi 2017-12-14 16:59:04 +01:00
• b50c1d966a on the fly moench photon finder and cluster saving Anna Bergamaschi 2017-12-14 16:58:22 +01:00
• 65a91c519e Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-14 14:29:16 +01:00
• 0649626842 made the color fix for black/white backgrounds Dhanya Maliakal 2017-12-14 14:29:07 +01:00
• 5958cf9278 Merge remote branch 'slsDetectorCalibration/developer' into developer Dhanya Maliakal 2017-12-12 11:14:38 +01:00
• e7f7e0f280 Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1 Dhanya Maliakal 2017-12-12 11:14:30 +01:00
• 735b8ea206 Merge remote branch 'slsDetectorCalibration/3.0' into 3.0 Dhanya Maliakal 2017-12-12 11:14:24 +01:00
• 56c504abbb Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4 Dhanya Maliakal 2017-12-12 11:14:19 +01:00
• 4d6346e678 Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3 Dhanya Maliakal 2017-12-12 11:14:15 +01:00
• dc7e448759 Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2 Dhanya Maliakal 2017-12-12 11:14:12 +01:00
• e658cbacda Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1 Dhanya Maliakal 2017-12-12 11:14:08 +01:00
• 1e6c6dea71 Merge remote branch 'slsDetectorCalibration/2.3' into 2.3 Dhanya Maliakal 2017-12-12 11:14:05 +01:00
• 0e5d4d1d8e Merge remote branch 'slsDetectorCalibration/2.2' into 2.2 Dhanya Maliakal 2017-12-12 11:14:01 +01:00
• a2986784d3 Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1 Dhanya Maliakal 2017-12-12 11:13:34 +01:00
• 975cbb576e Merge remote branch 'slsDetectorCalibration/2.1' into 2.1 Dhanya Maliakal 2017-12-12 11:06:15 +01:00
• e48a92d9cd Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5 2.0.5 Dhanya Maliakal 2017-12-12 11:02:57 +01:00
• f6e1c21137 Merge branch '3.0.1' into developer origin/developer Dhanya Maliakal 2017-12-12 09:05:50 +01:00
• 8da5b8318f removed a few stuff from gitignore origin/3.0.1 Dhanya Maliakal 2017-12-12 09:05:39 +01:00
• d2319459df Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-11 18:03:01 +01:00
• 03de29de90 refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour helfenstein_p 2017-12-11 18:02:33 +01:00
• d6bdbf8524 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-11 13:51:20 +01:00
• bb3e5351b4 solving warnings from latest linux Dhanya Maliakal 2017-12-11 13:51:11 +01:00
• 4c0a16cd75 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-11 11:13:32 +01:00
• d6a4f83a99 ignore misleading indentation Dhanya Maliakal 2017-12-11 11:13:25 +01:00
• e39d0aee56 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-11 10:51:28 +01:00
• 29d66e455d possible to make only certain components of system Dhanya Maliakal 2017-12-11 10:51:19 +01:00
• 1e849097ea merge conflict fixed in filename bug Dhanya Maliakal 2017-12-08 12:09:10 +01:00
• e19d564364 bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name Dhanya Maliakal 2017-12-08 12:04:59 +01:00
• 7577d03e75 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-08 11:50:15 +01:00
• 8c123982d2 get detector and receiver status only when necessary for stopacquisition Dhanya Maliakal 2017-12-08 11:50:10 +01:00
• 6e876d79ee conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop Dhanya Maliakal 2017-12-08 11:45:29 +01:00
• 40a7b3983a put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle Dhanya Maliakal 2017-12-08 11:40:07 +01:00
• 4718378d0a corrected bug fix in r_restreamstop Dhanya Maliakal 2017-12-06 19:21:28 +01:00
• 24c305ec59 solved conflicts from merge of version being used to binary Dhanya Maliakal 2017-12-06 19:07:06 +01:00
• bf9905ad2a possible to use binary --version or -v to get the branch and versionid Dhanya Maliakal 2017-12-06 19:05:35 +01:00
• c4a242e10a changed all variables from svn to git, included --version for receiver binary Dhanya Maliakal 2017-12-06 10:29:57 +01:00
• 1bf7b4a6a1 directory restuctured Anna Bergamaschi 2017-12-06 09:10:13 +01:00
• 2f3dc8d109 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-06 08:44:21 +01:00
• 7436d6c8d3 updaterev Dhanya Maliakal 2017-12-06 08:44:07 +01:00
• 7e932bf84b Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-05 16:04:26 +01:00
• b498043ea6 remember old read freq if not 0 in gui Dhanya Maliakal 2017-12-05 16:03:49 +01:00
• 98e09b29d5 merge conflict solved -1 in adc in gui Dhanya Maliakal 2017-12-05 15:39:02 +01:00
• 7aaf95a565 -1 in getadc fixed in gui as well Dhanya Maliakal 2017-12-05 15:37:34 +01:00
• a51f4f1252 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-05 14:49:32 +01:00
• 7b1f935da2 allowing to read adcs/temp during acquire Dhanya Maliakal 2017-12-05 14:49:20 +01:00
• 2d14da545d Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-05 13:47:09 +01:00
• ce1ec97571 some indentation in writing config file Dhanya Maliakal 2017-12-05 13:47:01 +01:00
• 9150556209 merge from 3.0.1 added more to write config/paramters Dhanya Maliakal 2017-12-05 13:42:35 +01:00
• 3b684c4662 Merge branch '3.0.1' into developer Dhanya Maliakal 2017-12-05 13:41:26 +01:00
• d00c837977 updated write config and write parameters list Dhanya Maliakal 2017-12-05 13:41:16 +01:00
• 0ef52138e1 merge conflict sorted, removing rest Dhanya Maliakal 2017-12-05 11:25:10 +01:00
• 28211af5af Makefile for Receiver merged incorrectly sometime back, also in archived project Dhanya Maliakal 2017-12-05 11:23:35 +01:00
• 536203b6dc one repo so need for gitall.sh Dhanya Maliakal 2017-12-05 11:16:22 +01:00
• 65b4c69847 REST implementation removed from slsReceiver Dhanya Maliakal 2017-12-05 11:03:52 +01:00
• 2ae5a959fe fix in receiver merge conflict (before the respos merge) Dhanya Maliakal 2017-12-04 18:35:57 +01:00
• 263d702535 Merge remote branch 'slsDetectorGui/developer' into developer Dhanya Maliakal 2017-12-04 16:48:32 +01:00
• 7512f818cb Merge remote branch 'slsReceiverSoftware/developer' into developer Dhanya Maliakal 2017-12-04 16:48:32 +01:00
• 25023f6971 Merge remote branch 'slsDetectorSoftware/developer' into developer Dhanya Maliakal 2017-12-04 16:48:30 +01:00
• 61791c078c Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1 Dhanya Maliakal 2017-12-04 16:48:17 +01:00
• 36802cdb14 Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1 Dhanya Maliakal 2017-12-04 16:48:17 +01:00
• e26cf3b673 Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1 Dhanya Maliakal 2017-12-04 16:48:15 +01:00
• aab62fccc1 Merge remote branch 'slsDetectorGui/3.0' into 3.0 origin/3.0 Dhanya Maliakal 2017-12-04 16:48:09 +01:00
• 73ce4abd58 Merge remote branch 'slsReceiverSoftware/3.0' into 3.0 Dhanya Maliakal 2017-12-04 16:48:08 +01:00
• c12b137b79 Merge remote branch 'slsDetectorSoftware/3.0' into 3.0 Dhanya Maliakal 2017-12-04 16:48:07 +01:00
• befdcf7f36 Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4 origin/2.3.4 Dhanya Maliakal 2017-12-04 16:48:01 +01:00
• 02f5c472a8 Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4 Dhanya Maliakal 2017-12-04 16:48:00 +01:00
• 75ed2cd2e4 Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4 Dhanya Maliakal 2017-12-04 16:47:59 +01:00
• 3be045f9b6 Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3 origin/2.3.3 Dhanya Maliakal 2017-12-04 16:47:54 +01:00
• 8fae982802 Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3 Dhanya Maliakal 2017-12-04 16:47:54 +01:00
• 128ec88b5f Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3 Dhanya Maliakal 2017-12-04 16:47:52 +01:00
• d5fc158330 Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2 origin/2.3.2 Dhanya Maliakal 2017-12-04 16:47:47 +01:00
• 864e6e4c81 Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2 Dhanya Maliakal 2017-12-04 16:47:47 +01:00
• 343d96ff16 Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2 Dhanya Maliakal 2017-12-04 16:47:46 +01:00
• 4142328437 Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1 origin/2.3.1 Dhanya Maliakal 2017-12-04 16:47:41 +01:00
• 6c797988c7 Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1 Dhanya Maliakal 2017-12-04 16:47:41 +01:00
• 215c262981 Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1 Dhanya Maliakal 2017-12-04 16:47:39 +01:00
• 081b809078 Merge remote branch 'slsDetectorGui/2.3' into 2.3 origin/2.3 Dhanya Maliakal 2017-12-04 16:47:35 +01:00
• 9263567cd8 Merge remote branch 'slsReceiverSoftware/2.3' into 2.3 Dhanya Maliakal 2017-12-04 16:47:34 +01:00