Review URL: https://codereview.appspot.com/9685045


Conflicts:

	src/compiler/glslang_tab.cpp

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