metsci/glimpse — pull request #2 by ulmangt (2012-03-14 21:25:38+00:00)
Title: Merged texture-atlas branch from metsci/glimpse-prerelease into master

I'm still experimenting with the correct git / git-hub procedure for managing flow of code between metsci/glimpse and metsci/glimpse-prerelease.

Here, I created a branch called texture-atlas on metsci/glimpse-prerelease, then used a pull request to merge it into metsci/glimpse-prerelease master.

I then pushed the texture-atlas branch to metsci/glimpse and am using another pull request to merge it into metsci/glimpse master.

I could have just pushed metsci/glimpse-prerelease master to metsci/glimpse master, but it seems like that would be likely to push changes which I wasn't necessarily ready to incorporate into metsci/glimpse. This way seemed safer, even if I do have to merge the branch twice...