message
message
Merge pull request #1 from Luxiaox/master

请求上传数据捕捉模块代码
	new file:   mypcap/Debug/mypcap.ilk
	new file:   mypcap/Debug/mypcap.pdb
	new file:   mypcap/mypcap.sdf
	new file:   mypcap/mypcap.sln
	new file:   mypcap/mypcap.suo
	new file:   mypcap/mypcap/Debug/CL.read.1.tlog
	new file:   mypcap/mypcap/Debug/CL.write.1.tlog
	new file:   mypcap/mypcap/Debug/cl.command.1.tlog
	new file:   mypcap/mypcap/Debug/link-cvtres.read.1.tlog
	new file:   mypcap/mypcap/Debug/link-cvtres.write.1.tlog
	new file:   mypcap/mypcap/Debug/link.command.1.tlog
	new file:   mypcap/mypcap/Debug/link.read.1.tlog
	new file:   mypcap/mypcap/Debug/link.write.1.tlog
	new file:   mypcap/mypcap/Debug/mt.command.1.tlog
	new file:   mypcap/mypcap/Debug/mt.read.1.tlog
	new file:   mypcap/mypcap/Debug/mt.write.1.tlog
	new file:   mypcap/mypcap/Debug/mypcap.exe.embed.manifest
	new file:   mypcap/mypcap/Debug/mypcap.exe.embed.manifest.res
	new file:   mypcap/mypcap/Debug/mypcap.exe.intermediate.manifest
	new file:   mypcap/mypcap/Debug/mypcap.lastbuildstate
	new file:   mypcap/mypcap/Debug/mypcap.log
	new file:   mypcap/mypcap/Debug/mypcap.obj
	new file:   mypcap/mypcap/Debug/mypcap.pch
	new file:   mypcap/mypcap/Debug/mypcap.res
	new file:   mypcap/mypcap/Debug/mypcapDlg.obj
	new file:   mypcap/mypcap/Debug/mypcap_manifest.rc
	new file:   mypcap/mypcap/Debug/rc.command.1.tlog
	new file:   mypcap/mypcap/Debug/rc.read.1.tlog
	new file:   mypcap/mypcap/Debug/rc.write.1.tlog
	new file:   mypcap/mypcap/Debug/stdafx.obj
	new file:   mypcap/mypcap/Debug/vc100.idb
	new file:   mypcap/mypcap/Debug/vc100.pdb
	new file:   mypcap/mypcap/ReadMe.txt
	new file:   mypcap/mypcap/mypcap.aps
new file:   mypcap/mypcap/mypcap.cpp
	new file:   mypcap/mypcap/mypcap.h
	new file:   mypcap/mypcap/mypcap.rc
	new file:   mypcap/mypcap/mypcap.vcxproj
	new file:   mypcap/mypcap/mypcap.vcxproj.filters
	new file:   mypcap/mypcap/mypcap.vcxproj.user
	new file:   mypcap/mypcap/mypcapDlg.cpp
	new file:   mypcap/mypcap/mypcapDlg.h
	new file:   mypcap/mypcap/res/mypcap.ico
	new file:   mypcap/mypcap/res/mypcap.rc2
	new file:   mypcap/mypcap/resource.h
	new file:   mypcap/mypcap/stdafx.cpp
	new file:   mypcap/mypcap/stdafx.h
	new file:   mypcap/mypcap/targetver.h
	new file:   mypcap/mypcap/utilities.cpp
	new file:   mypcap/mypcap/utilities.h
Merge branch 'master' of github.com:jingnan/windows-network-monitor
	new file:   mypcap/Protocol.h
	new file:   mypcap/mcf6Dlg.cpp
	new file:   mcf6/Debug/SavedData/20120414 203157.lix
	new file:   mcf6/Debug/SavedData/20120414 203225.lix
	new file:   mcf6/Debug/SavedData/20120414 203300.lix
	new file:   mcf6/Debug/SavedData/20120414 203323.lix
	new file:   mcf6/Debug/SavedData/20120414 203335.lix
	new file:   mcf6/Debug/mcf6.exe
	new file:   mcf6/Debug/mcf6.map
	new file:   mcf6/Debug/mcf6.pdb
	new file:   mcf6/UpgradeLog.XML
	new file:   mcf6/_UpgradeReport_Files/UpgradeReport.css
	new file:   mcf6/_UpgradeReport_Files/UpgradeReport.xslt
	new file:   mcf6/_UpgradeReport_Files/UpgradeReport_Minus.gif
	new file:   mcf6/_UpgradeReport_Files/UpgradeReport_Plus.gif
	new file:   mcf6/ipch/mcf6-260cebce/mcf6-f1be7a18.ipch
	new file:   mcf6/mcf6.ncb
	new file:   mcf6/mcf6.sdf
	new file:   mcf6/mcf6.sln
	new file:   mcf6/mcf6.sln.old
	new file:   mcf6/mcf6.suo
	new file:   mcf6/mcf6.suo.old
	new file:   mcf6/mcf6/ClassDiagram1.cd
	new file:   mcf6/mcf6/Debug/CL.read.1.tlog
	new file:   mcf6/mcf6/Debug/CL.write.1.tlog
	new file:   mcf6/mcf6/Debug/cl.command.1.tlog
	new file:   mcf6/mcf6/Debug/link-cvtres.read.1.tlog
	new file:   mcf6/mcf6/Debug/link-cvtres.write.1.tlog
	new file:   mcf6/mcf6/Debug/link.command.1.tlog
	new file:   mcf6/mcf6/Debug/link.read.1.tlog
	new file:   mcf6/mcf6/Debug/link.write.1.tlog
	new file:   mcf6/mcf6/Debug/mcf6.exe.intermediate.manifest
	new file:   mcf6/mcf6/Debug/mcf6.lastbuildstate
	new file:   mcf6/mcf6/Debug/mcf6.log
	new file:   mcf6/mcf6/Debug/mcf6.obj
	new file:   mcf6/mcf6/Debug/mcf6.pch
	new file:   mcf6/mcf6/Debug/mcf6.res
	new file:   mcf6/mcf6/Debug/mcf6Dlg.obj
	new file:   mcf6/mcf6/Debug/mt.command.1.tlog
	new file:   mcf6/mcf6/Debug/mt.read.1.tlog
	new file:   mcf6/mcf6/Debug/mt.write.1.tlog
	new file:   mcf6/mcf6/Debug/rc.command.1.tlog
	new file:   mcf6/mcf6/Debug/rc.read.1.tlog
	new file:   mcf6/mcf6/Debug/rc.write.1.tlog
	new file:   mcf6/mcf6/Debug/stdafx.obj
	new file:   mcf6/mcf6/Debug/utilities.obj
	new file:   mcf6/mcf6/Debug/vc100.idb
	new file:   mcf6/mcf6/Debug/vc100.pdb
	new file:   mcf6/mcf6/Protocol.h
	new file:   mcf6/mcf6/ReadMe.txt
	new file:   mcf6/mcf6/Resource.h
	new file:   mcf6/mcf6/SavedData/20120414 144734.lix
	new file:   mcf6/mcf6/SavedData/20120414 201420.lix
	new file:   mcf6/mcf6/SavedData/20120414 203359.lix
	new file:   mcf6/mcf6/SavedData/20120619 233002.lix
	new file:   mcf6/mcf6/SavedData/20120619 233235.lix
	new file:   mcf6/mcf6/SavedData/20120619 233331.lix
	new file:   mcf6/mcf6/SavedData/20120629 152515.lix
	new file:   mcf6/mcf6/UpgradeLog.XML
	new file:   mcf6/mcf6/_UpgradeReport_Files/UpgradeReport.css
	new file:   mcf6/mcf6/_UpgradeReport_Files/UpgradeReport.xslt
	new file:   mcf6/mcf6/_UpgradeReport_Files/UpgradeReport_Minus.gif
	new file:   mcf6/mcf6/_UpgradeReport_Files/UpgradeReport_Plus.gif
new file:   mcf6/mcf6/ipch/mcf6-260cebce/mcf6-f1be7a18.ipch
	new file:   mcf6/mcf6/mcf6.aps
	new file:   mcf6/mcf6/mcf6.cpp
	new file:   mcf6/mcf6/mcf6.h
new file:   mcf6/mcf6/mcf6.rc
	new file:   mcf6/mcf6/mcf6.sdf
	new file:   mcf6/mcf6/mcf6.suo
	new file:   mcf6/mcf6/mcf6.vcproj
	new file:   mcf6/mcf6/mcf6.vcproj.china-PC.Administrator.user
	new file:   mcf6/mcf6/mcf6.vcxproj
	new file:   mcf6/mcf6/mcf6.vcxproj.filters
	new file:   mcf6/mcf6/mcf6.vcxproj.user
	new file:   mcf6/mcf6/mcf6Dlg.cpp
	new file:   mcf6/mcf6/mcf6Dlg.h
	new file:   mcf6/mcf6/res/20061119220314481.png
	new file:   mcf6/mcf6/res/mcf6.ico
	new file:   mcf6/mcf6/res/mcf6.rc2
	new file:   mcf6/mcf6/stdafx.cpp
	new file:   mcf6/mcf6/stdafx.h
	new file:   mcf6/mcf6/targetver.h
	new file:   mcf6/mcf6/utilities.cpp
	new file:   mcf6/mcf6/utilities.h
	modified:   mypcap/mypcap.sdf
	modified:   mypcap/mypcap.suo
	new file:   mypcap/mypcap/aaa.cpp
	new file:   jingnan's code/mcf6.cpp
	new file:   jingnan's code/mcf6.h
	new file:   jingnan's code/utilities.cpp
	new file:   jingnan's code/utilities.h
Merge branch 'master' of github.com:jingnan/windows-network-monitor