1. Greg Slepak
  2. shaderlanguages
  3. Pull requests

Pull requests

#1 Open

OpenGL SL.tmLanguage edited online with Bitbucket - fixed multiline comments

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update taoeffect/opengl-sltmlanguage-edited-online-with-b-1375651234628
hg pull -r taoeffect/opengl-sltmlanguage-edited-online-with-b-1375651299196 https://bitbucket.org/taoeffect/shaderlanguages-1
hg merge taoeffect/opengl-sltmlanguage-edited-online-with-b-1375651299196
hg commit -m 'Merged in taoeffect/shaderlanguages-1/taoeffect/opengl-sltmlanguage-edited-online-with-b-1375651299196 (pull request #1)'
Author
  1. Greg Slepak
Reviewers
Description

OpenGL SL.tmLanguage edited online with Bitbucket - fixed multiline comments

  • Learn about pull requests

Comments (0)