Merge branch 'develope' into CYS01_branch

# Conflicts: # doc/doc.txt
develop
1 changed files with 3 additions and 1 deletions
--- a/doc/doc.txt
+++ b/doc/doc.txt
@ -1,2 +1,4 @@
 Test
 000
 999999999
 develope
Author	SHA1	Message	Date
Lastw	061cc49b73	Merge branch 'develope' into CYS01_branch # Conflicts: # doc/doc.txt	7 months ago
Lastw	6ae2ca5695	develop	7 months ago
Lastw	7ec1a7b2de	doc	7 months ago