diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
| commit | f707ea3ce065f0ce40f586c40283fab42059b485 (patch) | |
| tree | 055a5ccdecaec105365d1de9a90d7d6b38f257fb /xorg-server | |
| parent | c8483dc2831dc37d93a36804022f6b064f5962ea (diff) | |
| parent | 09e94a8e392e8fe6fd89ddefbf3897a92e525b5b (diff) | |
| download | vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.gz vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.bz2 vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Added presentproto-1.0
libxtrans libxcb xcb-proto mesa git update 8 nov 2013
Conflicts:
X11/xtrans/Xtransint.h
X11/xtrans/Xtranssock.c
libxcb/src/.gitignore
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'xorg-server')
24 files changed, 0 insertions, 0 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 0bf27f4c6..0bf27f4c6 100755..100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index b2ca29f10..b2ca29f10 100755..100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index f9b45d816..f9b45d816 100755..100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h index a054416c4..a054416c4 100755..100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h index 26b03cd39..26b03cd39 100755..100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h index 32bdf9d06..32bdf9d06 100755..100644 --- a/xorg-server/glx/glprocs.h +++ b/xorg-server/glx/glprocs.h diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index ee0487e92..ee0487e92 100755..100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c index 17204c17d..17204c17d 100755..100644 --- a/xorg-server/glx/indirect_program.c +++ b/xorg-server/glx/indirect_program.c diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index a1a946e5c..a1a946e5c 100755..100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c index 01e33d5c9..01e33d5c9 100755..100644 --- a/xorg-server/glx/render2.c +++ b/xorg-server/glx/render2.c diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c index 435fa26ad..435fa26ad 100755..100644 --- a/xorg-server/glx/render2swap.c +++ b/xorg-server/glx/render2swap.c diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c index 26462f343..26462f343 100755..100644 --- a/xorg-server/glx/renderpix.c +++ b/xorg-server/glx/renderpix.c diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c index e4da31f94..e4da31f94 100755..100644 --- a/xorg-server/glx/renderpixswap.c +++ b/xorg-server/glx/renderpixswap.c diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c index 47ff3e4c7..47ff3e4c7 100755..100644 --- a/xorg-server/glx/single2swap.c +++ b/xorg-server/glx/single2swap.c diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c index 10fd651df..10fd651df 100755..100644 --- a/xorg-server/glx/singlepix.c +++ b/xorg-server/glx/singlepix.c diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c index 7e20ed6bb..7e20ed6bb 100755..100644 --- a/xorg-server/glx/singlepixswap.c +++ b/xorg-server/glx/singlepixswap.c diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h index d66c76e1e..d66c76e1e 100755..100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.h +++ b/xorg-server/hw/kdrive/ephyr/ephyr.h diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c index 218e3b00c..218e3b00c 100755..100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c index 510dd2456..510dd2456 100755..100644 --- a/xorg-server/hw/kdrive/ephyr/hostx.c +++ b/xorg-server/hw/kdrive/ephyr/hostx.c diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c index 9733e7526..9733e7526 100755..100644 --- a/xorg-server/hw/xwin/glx/glwrap.c +++ b/xorg-server/hw/xwin/glx/glwrap.c diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index 495e366ca..495e366ca 100755..100644 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index 6d794b671..6d794b671 100755..100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c index 8597e5b4a..8597e5b4a 100755..100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c index 30de32b1e..30de32b1e 100755..100644 --- a/xorg-server/os/xstrans.c +++ b/xorg-server/os/xstrans.c |