am 7a486528: am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"

* commit '7a4865287460a5f0ff26e22be5f0271735d32ac7':
  gl_code.cpp: Remove a DOS style newline