Information for 4.0-296

Version
4.0-296
Branch
master
Date
11 years, 1 month ago
Ubuntu 13.04
Commit
82729fcc8f7eef347720052f8d10c14830b7ae8c
Change author
comex
Change description 
Merge remote-tracking branch 'shuffle2/vc12'

Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters