modified:   MyFFT/Src/gui/guiMain.cpp
	modified:   MyFFT/Src/gui/guiMain.cpp~
	modified:   MyFFT/inc/gui/guiMain.h
	modified:   MyFFT/inc/gui/guiMain.h~
	deleted:    MyFFT/MyFFT.pro~
Merge branch 'master' of https://github.com/HustStevenZ/FFTDinosaur

	modified:   MyFFT/MOC/moc_guiMain.cpp
	modified:   MyFFT/Makefile
	modified:   MyFFT/Makefile.Debug
	modified:   MyFFT/Makefile.Release
	modified:   MyFFT/Src/mid/DinoMidware.cpp
	modified:   MyFFT/inc/gui/guiMain.h
	modified:   MyFFT/inc/mid/DinoMidware.h
	modified:   MyFFT/obj/guiMain.obj
	modified:   MyFFT/obj/main.obj
	modified:   MyFFT/obj/moc_guiMain.obj
	modified:   MyFFT/out/Dinosaur.exe
	modified:   MyFFT/out/Dinosaur.ilk
	modified:   MyFFT/out/Dinosaur.pdb
	modified:   MyFFT/ui/ui_fftv2.h
	modified:   MyFFT/vc100.pdb
Merge branch 'master' of https://github.com/HustStevenZ/FFTDinosaur