Conflicts:

	src/common/version.h

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2255 736b8ea6-26fd-11df-bfd4-992fa37f6226