|
|
28211af5af
|
Makefile for Receiver merged incorrectly sometime back, also in archived project
|
2017-12-05 11:23:35 +01:00 |
|
|
|
536203b6dc
|
one repo so need for gitall.sh
|
2017-12-05 11:16:22 +01:00 |
|
|
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
|
|
2ae5a959fe
|
fix in receiver merge conflict (before the respos merge)
|
2017-12-04 18:35:57 +01:00 |
|
|
|
263d702535
|
Merge remote branch 'slsDetectorGui/developer' into developer
|
2017-12-04 16:48:32 +01:00 |
|
|
|
7512f818cb
|
Merge remote branch 'slsReceiverSoftware/developer' into developer
|
2017-12-04 16:48:32 +01:00 |
|
|
|
25023f6971
|
Merge remote branch 'slsDetectorSoftware/developer' into developer
|
2017-12-04 16:48:30 +01:00 |
|
|
|
61791c078c
|
Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
|
|
36802cdb14
|
Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
|
|
e26cf3b673
|
Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:15 +01:00 |
|
|
|
aab62fccc1
|
Merge remote branch 'slsDetectorGui/3.0' into 3.0
|
2017-12-04 16:48:09 +01:00 |
|
|
|
73ce4abd58
|
Merge remote branch 'slsReceiverSoftware/3.0' into 3.0
|
2017-12-04 16:48:08 +01:00 |
|
|
|
c12b137b79
|
Merge remote branch 'slsDetectorSoftware/3.0' into 3.0
|
2017-12-04 16:48:07 +01:00 |
|
|
|
befdcf7f36
|
Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4
|
2017-12-04 16:48:01 +01:00 |
|
|
|
02f5c472a8
|
Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:48:00 +01:00 |
|
|
|
75ed2cd2e4
|
Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:47:59 +01:00 |
|
|
|
3be045f9b6
|
Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
|
|
8fae982802
|
Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
|
|
128ec88b5f
|
Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:52 +01:00 |
|
|
|
d5fc158330
|
Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
|
|
864e6e4c81
|
Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
|
|
343d96ff16
|
Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:46 +01:00 |
|
|
|
4142328437
|
Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
|
|
6c797988c7
|
Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
|
|
215c262981
|
Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:39 +01:00 |
|
|
|
081b809078
|
Merge remote branch 'slsDetectorGui/2.3' into 2.3
|
2017-12-04 16:47:35 +01:00 |
|
|
|
9263567cd8
|
Merge remote branch 'slsReceiverSoftware/2.3' into 2.3
|
2017-12-04 16:47:34 +01:00 |
|
|
|
58e90a85be
|
Merge remote branch 'slsDetectorSoftware/2.3' into 2.3
|
2017-12-04 16:47:33 +01:00 |
|
|
|
025c836e25
|
Merge remote branch 'slsDetectorGui/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
|
|
5d5abae3f4
|
Merge remote branch 'slsReceiverSoftware/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
|
|
e2ad46386e
|
Merge remote branch 'slsDetectorSoftware/2.2' into 2.2
|
2017-12-04 16:47:26 +01:00 |
|
|
|
308d44e452
|
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
|
|
69da61b1fb
|
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
|
|
460168ce04
|
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:21 +01:00 |
|
|
|
4e429c0d77
|
Merge remote branch 'slsDetectorGui/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
|
|
bf4fab549d
|
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
|
|
f7705eb1da
|
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
|
2017-12-04 16:45:32 +01:00 |
|
|
|
a2217e2066
|
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:33:33 +01:00 |
|
|
|
aaa02706fc
|
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:31:52 +01:00 |
|
|
|
9f152ce1f3
|
merge conflict resolved
|
2017-12-01 12:44:34 +01:00 |
|
|
|
d1e3d50a87
|
cosmetic print outs
|
2017-12-01 12:43:14 +01:00 |
|
|
|
a06f29f473
|
minor cosmetics
|
2017-12-01 11:23:17 +01:00 |
|
|
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
|
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
|
|
0e26734023
|
restreaming stop fix
|
2017-11-30 19:13:55 +01:00 |
|
|
|
fd64ba289e
|
Merge branch '3.0.1' into developer
|
2017-11-30 19:07:21 +01:00 |
|
|
|
e9343a5bd0
|
remove warning
|
2017-11-30 19:07:05 +01:00 |
|
|
|
6f3898441e
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:47 +01:00 |
|
|
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
|
|
385e6714cc
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:19 +01:00 |
|
