Merge branch 'release/2.17.2'

Merge branch 'release/2.17.1'
2023-02-23 15:51:49 +01:00 · 2023-02-22 07:47:27 +01:00 · 2023-02-22 07:30:06 +01:00 · 2023-02-22 06:14:17 +01:00 · 2023-02-21 19:57:07 +01:00 · 2022-06-12 20:58:31 +02:00
2 changed files with 4 additions and 0 deletions
--- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java
+++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java
@ -332,7 +332,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
 				while(next != null && !break_type.isEqualType(next)) {
 					long tag = readTag();
 					switch((int)tag) {
+<<<<<<< HEAD
+					case 6: // info
+=======
 					case 6: { // info
+>>>>>>> refs/heads/release/2.17.1
 						CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(readByteString()));
 						long sz = cbd.readArrayLength();
 						assert(sz==3);
--- a/tests/com.minres.scviewer.database.test/inputs/my_db.ftr
+++ b/tests/com.minres.scviewer.database.test/inputs/my_db.ftr
Author	SHA1	Message	Date
Eyck Jentzsch	7a98eda464	Merge branch 'release/2.17.2'	2023-02-23 15:51:49 +01:00
Eyck Jentzsch	e0f174173c	Merge branch 'release/2.17.1'	2023-02-22 07:47:27 +01:00
Eyck Jentzsch	8aca26e499	Merge branch 'release/2.17.1'	2023-02-22 07:30:06 +01:00
Eyck Jentzsch	01c9b7f1c2	adds support for FTR chunk type 0	2023-02-22 06:14:17 +01:00
Eyck Jentzsch	f7f512a5f3	Merge branch 'release/2.17.0'	2023-02-21 19:57:07 +01:00
Eyck Jentzsch	3a931d59d5	Merge branch 'release/2.16.1'	2022-06-12 20:58:31 +02:00
Eyck Jentzsch	fda4c64ac7	Merge branch 'release/2.16.0'	2022-05-16 21:16:31 +02:00
Eyck Jentzsch	539e5de813	Merge branch 'release/2.15.1'	2021-12-02 16:55:18 +01:00