comex 82729fcc8f Merge remote-tracking branch 'shuffle2/vc12'
Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters
2013-10-31 16:51:56 -04:00
..
2013-10-12 20:31:59 +02:00
2013-04-24 09:21:54 -04:00
2013-10-12 20:31:59 +02:00
2013-09-01 23:33:35 -04:00
2013-04-24 09:21:54 -04:00