any
Merge branch 'milestone1' of code.csdn.net:QawsQAER/esdc2014 into milestone1
Merge branch 'milestone1' of code.csdn.net:QawsQAER/esdc2014 into milestone1
fixbug in test filetransfer mode
Merge branch 'milestone1' of code.csdn.net:QawsQAER/esdc2014 into milestone1
for sync
Merge branch 'milestone1' of code.csdn.net:QawsQAER/esdc2014 into milestone1
git add Merge branch 'milestone1' of code.csdn.net:QawsQAER/esdc2014 into milestone1
fileXXbug
add ./ESDC 3 launch mode for using both WebCam and Canon camera