Reviewing merge request #484: fixed case of "gl" to "GL" for include directory

The directory "GL" comes from the MinGW w32api package. It is incorrectly referred to as "gl" in an include statement in this file. This is harmless on case-insensitive Windows but breaks when building on other platforms.

Requested by: mabrand
Status: Merged
Source repository: mabrands-clone:build.ds9.GL
Target repository: qt:master
Created at: March 1st, 2010 19:27

Commits that would be merged:

Version 1

Version 1

6174f91
ea6504e

fixed case of GL include directory

Showing

Showing 6174f91-ea6504e

Comments
Include comments entered inline

→ State changed from New to Merged

Thanks, merged as 4d263d64e561a07518985be1a111207a9243bf8d to 4.7.

Thiago Macieira | 2010-03-05 16:05:08 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/484

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt/qt.git \
  refs/merge-requests/484

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/484

# To apply the changes to your branch:
git checkout master
git merge merge-requests/484
git push origin master

Reviewing merge request #484: fixed case of "gl" to "GL" for include directory

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline