vcxsrv/xorg-server/glx/glprocs.h, branch bugfix/bug3
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3
2015-04-20T20:42:55+00:00
Merge remote-tracking branch 'origin/released'
2015-04-20T20:42:55+00:00
marha
marha@users.sourceforge.net
2015-04-20T20:42:55+00:00
urn:sha1:934184bfecd402aae891b8740d788b486aa7269f
Conflicts:
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/dlopen.h
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/randr/rrxinerama.c
Merge remote-tracking branch 'origin/released'
2015-03-22T13:10:47+00:00
marha
marha@users.sourceforge.net
2015-03-22T13:10:47+00:00
urn:sha1:3bc24b271f45f9f33484b8cf53b44f33f7e8a237
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Merged origin/release (checked in because wanted to merge new stuff)
2015-02-22T20:39:56+00:00
marha
marha@users.sourceforge.net
2015-02-22T20:39:56+00:00
urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b
Merge remote-tracking branch 'origin/released'
2014-11-29T11:44:10+00:00
marha
marha@users.sourceforge.net
2014-11-29T11:44:10+00:00
urn:sha1:0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6
Conflicts:
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/wingetsp.c
xorg-server/hw/xwin/winmisc.c
xorg-server/hw/xwin/winnativegdi.c
xorg-server/hw/xwin/winpfbdd.c
xorg-server/hw/xwin/winpixmap.c
xorg-server/hw/xwin/winpolyline.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwindow.c
Synchronised and compiled
2014-08-22T20:27:13+00:00
marha
marha@users.sourceforge.net
2014-08-22T20:27:13+00:00
urn:sha1:4469aefef31cd682683944aa91e0b3edc0042fa4
Compiled and synchronised
2014-08-22T19:51:08+00:00
marha
marha@users.sourceforge.net
2014-08-22T19:51:08+00:00
urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5
Synchronised files
2014-07-28T19:39:53+00:00
marha
marha@users.sourceforge.net
2014-07-28T19:39:53+00:00
urn:sha1:ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b
Synchronised files
2014-05-11T19:02:05+00:00
marha
marha@users.sourceforge.net
2014-05-11T19:02:05+00:00
urn:sha1:0b89941658d6117d17555ee28c6e5d7715673705
Solved compile problems due to latest merge
2014-04-23T21:23:44+00:00
marha
marha@users.sourceforge.net
2014-04-23T21:23:44+00:00
urn:sha1:26287ff521b55de188c7b41eee4bff389844c6c3
Merge remote-tracking branch 'origin/released'
2014-03-09T21:56:02+00:00
marha
marha@users.sourceforge.net
2014-03-09T21:56:02+00:00
urn:sha1:2112b7dec49833ba872bd3ebcd7288930fec0796
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c