919 Commits

Author	SHA1	Message	Date
Robin Mueller	08d7b3b859	update changelog	2022-05-03 11:34:47 +02:00
Robin Mueller	456dac6afd	SHM and socket readout working now	2022-05-03 11:33:07 +02:00
Robin Mueller	7db0872ee3	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-02 12:49:53 +02:00
Robin Mueller	bab8412f10	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-02 12:41:45 +02:00
Cleanroom Laptop L15	3d817363e6	fixed conflicts	2022-04-29 18:26:20 +02:00
Robin Mueller	1527b60fd6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 18:26:34 +02:00
Robin Mueller	cb47667d01	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 17:56:33 +02:00
Robin Mueller	3a03d6ca55	update CHANGELOG	2022-04-28 17:56:06 +02:00
Robin Mueller	e16f5e68d6	update changelog	2022-04-28 17:54:47 +02:00
Jakob.Meier	6d326137fb	Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop ... Reviewed-on: #225 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:15:37 +02:00
Robin Mueller	40b84b0576	update changelog	2022-04-28 13:08:19 +02:00
Robin Mueller	ab85ebf83e	update CHANGELOG	2022-04-28 11:37:06 +02:00
Robin Mueller	9f3a56e5e6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-23 12:37:25 +02:00
Robin Mueller	f421fd4dde	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-23 12:30:45 +02:00
Robin Mueller	ea139d0657	added new revision	2022-04-22 16:16:25 +02:00
Robin Mueller	88249cd5be	update changelog	2022-04-22 11:07:40 +02:00
Robin Mueller	4a5ea4450f	update changelog	2022-04-22 10:59:43 +02:00
Robin Mueller	2c491b27c0	update CHANGELOG	2022-04-21 14:21:02 +02:00
Robin Mueller	ae2cd52087	add changelog	2022-04-21 14:18:41 +02:00