Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2015-04-30 | 1 | -0/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2015-03-22 | 1 | -0/+186 |
Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c |