Merge branch 'master' of rcs-dev:core-packer · hackedteam/core-packer@d36c305 · GitHub

Commit

Merge branch 'master' of rcs-dev:core-packer

Browse files

Conflicts:
	core-packer.suo
	core-packer/DllEntryPoint32.cpp
	core-packer/core-packer.vcxproj
	core-packer/core-packer.vcxproj.filters
	core-packer/symbols.h

Loading branch information

cod committed Sep 6, 2013

2 parents 74127e0 + b345e4e commit d36c305