checking initial Globals.conf for msl
Change Globals.conf for my pc
added laptop stefan
added old configurations folder
asd
asd
erge branch 'master' of ssh://barbuda.vs.eecs.uni-kassel.de/~/git-repos/cnc-msl

Conflicts:
	etc/Globals.conf
asd
simulator
Merge branch 'master' of barbuda.vs.eecs.uni-kassel.de:~/git-repos/cnc-msl
use qtimer instead of commandSocket
updates ... works now
package
testupdates
seems to work
ignore proxy_gen
stuff
fixed compile bug
changed stupid execution rights
first base