Merge branch 'MSVC' of https://github.com/fsb4000/novacoin into fsb4000-MSVC
authorMASM fan <masmfan@gmail.com>
Fri, 7 Nov 2014 19:10:58 +0000 (23:10 +0400)
committerMASM fan <masmfan@gmail.com>
Fri, 7 Nov 2014 19:10:58 +0000 (23:10 +0400)
commite7e025dc61365eaf476dd22f59fd7228640a98ed
tree902e2e1fa85c8e921f766248f07f52c6ed99bc27
parent5dbad04a3acbbac8bdc3565041678d6359e2e360
parent18770118e846622f59a86f9937a33da0bb761775
Merge branch 'MSVC' of https://github.com/fsb4000/novacoin into fsb4000-MSVC

Conflicts:
src/serialize.h
src/zerocoin/Commitment.cpp
MSVC/libcommon/libcommon.vcxproj
MSVC/libcommon/libcommon.vcxproj.filters
MSVC/mynovacoinqt/mynovacoinqt.vcxproj
MSVC/mynovacoinqt/mynovacoinqt.vcxproj.filters
src/main.cpp
src/main.h
src/serialize.h