modified:   purplecoin-qt.pro
	modified:   src/makefile.mingw
	modified:   src/net.cpp
	deleted:    src/purplecoind.exe
Merge branch 'master' of https://github.com/rtc29462/PurpleCoin

Conflicts:
	purplecoin-qt.pro

	modified:   purplecoin-qt.pro