diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
| commit | 0f16b07a041148ce9d050ec58f42a4302a9cb2cf (patch) | |
| tree | 5661a0431da6ed5e2a68dae1bae3fe83e47e208a /src/gallium/state_trackers/egl/common/egl_g3d_st.h | |
| parent | 563a7e3cc552fdcfcaf9ac0d4b1683c3ba2ae732 (diff) | |
| parent | eee220d65d3d37030f33971b02823c614e3eb618 (diff) | |
| download | mesa-0f16b07a041148ce9d050ec58f42a4302a9cb2cf.tar.gz | |
Merge branch 'master' into lp-surface-tilinglp-surface-tiling
This brings in the gallium-resources branch changes. Things seem to be
working but there's probabaly bugs to be found.
Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_scene.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
Diffstat (limited to 'src/gallium/state_trackers/egl/common/egl_g3d_st.h')
| -rw-r--r-- | src/gallium/state_trackers/egl/common/egl_g3d_st.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/egl/common/egl_g3d_st.h b/src/gallium/state_trackers/egl/common/egl_g3d_st.h index ea8b4068cd8..c82681a22d8 100644 --- a/src/gallium/state_trackers/egl/common/egl_g3d_st.h +++ b/src/gallium/state_trackers/egl/common/egl_g3d_st.h @@ -14,12 +14,13 @@ * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: * Chia-I Wu <olv@lunarg.com> |