mac

on mac tst
mac !!
!!
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro
	CMDSim.pro.user
mac me
Merge branch 'master' into mac
Merge branch 'master' into mac
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro.user
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro.user
tmp cti
!!:w
Merge branch 'mac'