..
Merge branch 'master' of a73435.berlin.ptb.de:thomas.bock/yamp
- checkNum function in yamp.utils
- expansion string
- weiter mit frs5-se2
frs5-se2 bis Kesseltemp. messen

	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	modified:   docs/frs5-se2/yamp.Obj/Tasks.arr.js
	modified:   docs/se1_calibration/_rev.str.txt
	modified:   docs/se1_calibration/yamp.Obj/Tasks.arr.js
wirklich funktionierende T-ini

	modified:   docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Tasks.arr.js
	modified:   docs/7f696c493207f8d813f3b4e1f00a34c8/_rev.str.txt
	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	modified:   docs/frs5-se2/yamp.Obj/Tasks.arr.js
- YAMP-Beschreibung angepasst
- links hinzugef.

	modified:   docs/7f696c493207f8d813f3b4e1f00a34c8/_rev.str.txt
	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	new file:   docs/frs5-se2/yamp.Obj/Links.obj.js
	modified:   docs/frs5-se2/yamp.Obj/Tasks.arr.js
	modified:   lib/doc/YampDescription.md
se2 keithley weg
keithley die 20.
	modified:   docs/7f696c493207f8d813f3b4e1f00a34c8/_rev.str.txt
	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	modified:   docs/frs5-se2/yamp.Obj/Tasks.arr.js
Merge branch 'master' of a73435.berlin.ptb.de:thomas.bock/yamp

Conflicts:
	docs/7f696c493207f8d813f3b4e1f00a34c8/_rev.str.txt

	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Comment.str.txt
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Date.obj.js
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Defaults.obj.js
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Device.obj.js
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Name.str.txt
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Sign.str.txt
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Tasks.arr.js
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Type.str.txt
	deleted:    docs/7f696c493207f8d813f3b4e1f00a34c8/_id.str.txt
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Comment.str.txt
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Constants.arr.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Date.obj.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Defaults.obj.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Device.obj.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Name.str.txt
	renamed:    docs/7f696c493207f8d813f3b4e1f00a34c8/CalibrationObject.Obj/Owner.obj.js -> docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Owner.obj.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Sign.str.txt
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Tasks.arr.js
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Type.str.txt
	new file:   docs/fd335202a81ec66fd614eee420539899/CalibrationObject.Obj/Uncertainty.arr.js
	new file:   docs/fd335202a81ec66fd614eee420539899/_id.str.txt
	new file:   docs/fd335202a81ec66fd614eee420539899/_rev.str.txt
	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	modified:   docs/frs5-se2/yamp.Obj/Tasks.arr.js
Knöpfe Scrollbalken Issue #5

	modified:   _attachments/vaclab/yamp.pre.js
	modified:   _attachments/vaclab/yamp.utils.js
	modified:   docs/frs5-se2/_rev.str.txt
	modified:   docs/frs5-se2/yamp.Obj/InfoPages.arr.js
	modified:   templates/goCss.css
	modified:   templates/infoPage.html
Merge branch 'master' of gitproxy:wactbprot/yamp
Merge branch 'master' of gitproxy:wactbprot/yamp