[X2Go-Commits] [vcxsrv] 02/13: Merge remote-tracking branch 'origin/released'

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 1.16.2.0
in repository vcxsrv.

commit 9fc852414dd4e841c4e2229f55a3e41abca64ac5
Merge: 8d44af7 fa5a6df
Author: marha <marha at users.sourceforge.net>
Date:   Sun Oct 19 11:18:56 2014 +0200

    Merge remote-tracking branch 'origin/released'
    
    Conflicts:
    	mesalib/src/mesa/main/bufferobj.c

 mesalib/configure.ac                               |   38 ++---
 mesalib/docs/GL3.txt                               |    2 +-
 mesalib/docs/index.html                            |   12 ++
 mesalib/docs/relnotes.html                         |    2 +
 mesalib/docs/relnotes/10.2.9.html                  |  101 +++++++++++++
 mesalib/docs/relnotes/10.3.1.html                  |  158 ++++++++++++++++++++
 mesalib/docs/relnotes/10.4.html                    |    1 +
 mesalib/src/glsl/README                            |   16 +-
 mesalib/src/mesa/drivers/common/meta_blit.c        |    1 +
 mesalib/src/mesa/main/bufferobj.c                  |   21 ++-
 mesalib/src/mesa/main/bufferobj.h                  |    2 +-
 mesalib/src/mesa/main/dd.h                         |    2 +-
 mesalib/src/mesa/main/mtypes.h                     |   13 ++
 mesalib/src/mesa/main/shared.c                     |    2 +-
 mesalib/src/mesa/main/teximage.c                   |    6 +
 .../src/mesa/state_tracker/st_cb_bufferobjects.c   |    4 +-
 mesalib/src/mesa/state_tracker/st_cb_eglimage.c    |    3 +-
 mesalib/src/mesa/state_tracker/st_cb_texture.c     |   13 +-
 mesalib/src/mesa/state_tracker/st_gen_mipmap.c     |    2 +-
 mesalib/src/mesa/state_tracker/st_texture.c        |    6 +-
 mesalib/src/mesa/state_tracker/st_texture.h        |    3 +-
 mesalib/src/mesa/state_tracker/st_vdpau.c          |    4 +-
 mesalib/src/mesa/vbo/vbo_exec_api.c                |    2 +-
 mesalib/src/mesa/vbo/vbo_save_api.c                |    4 +-
 24 files changed, 355 insertions(+), 63 deletions(-)

diff --cc mesalib/src/mesa/drivers/common/meta_blit.c
index c6616d9,01cb532..01cb532
mode 100755,100644..100755
--- a/mesalib/src/mesa/drivers/common/meta_blit.c
+++ b/mesalib/src/mesa/drivers/common/meta_blit.c
diff --cc mesalib/src/mesa/main/bufferobj.c
index c29a8c7,0ee8856..c88744a
mode 100644,100644..100755
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@@ -388,8 -388,8 +388,8 @@@ convert_clear_buffer_data(struct gl_con
   * 
   * Default callback for the \c dd_function_table::NewBufferObject() hook.
   */
 -static struct gl_buffer_object *
 +struct gl_buffer_object *
- _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
+ _mesa_new_buffer_object(struct gl_context *ctx, GLuint name)
  {
     struct gl_buffer_object *obj;
  

--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git