[Mesa-dev] Candidate branch for upcoming 9.1.6

[Carl Worth]

Ian Romanick <idr at freedesktop.org> writes:
>> Carl Worth (4):
>>        docs: Add 9.1.5 release md5sums
>>        Merge 'origin/9.1' into stable
>
> What happened here?

I had a local "stable" branch from origin/9.1 from which I did all my
testing, made the release, and added a commit with the md5sums, etc.

In the meantime, other developers pushed other changes to the "9.1"
branch upstream.

The net result of that is a simple merge commit in the history, which
should not cause any real problem, (and makes it quite plain to see
precisely what happened).

-Carl

-- 
carl.d.worth at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130731/3732f887/attachment.pgp>