vcxsrv/xorg-server/makefile, branch bugfix/bug3 VcXsrv Windows X Server (X2Go/Arctica Builds) https://openid.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-02-24T06:44:41+00:00 marha marha@users.sourceforge.net 2015-02-24T06:44:41+00:00 urn:sha1:f64e43decd0fdac938feddeedee255dc4508aaa5 Conflicts: apps/xcalc/math.c freetype/src/base/ftbdf.c freetype/src/base/fttype1.c freetype/src/pfr/pfrobjs.c mesalib/src/mesa/main/.gitignore openssl/Configure openssl/Makefile openssl/crypto/cryptlib.c openssl/crypto/opensslconf.h openssl/test/v3nametest.c openssl/util/mk1mf.pl openssl/util/pl/VC-32.pl xorg-server/Xi/xipassivegrab.c xorg-server/dix/dispatch.c xorg-server/dix/getevents.c xorg-server/glx/glxcmds.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winprocarg.c xorg-server/render/render.c Merge remote-tracking branch 'origin/released' 2014-10-01T21:12:13+00:00 marha marha@users.sourceforge.net 2014-10-01T21:12:13+00:00 urn:sha1:88236adfe3eb41b8368b4c9ecf3e09a7199dc474 Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winglobals.c Solved compilation and link problems after last merge 2013-11-08T10:47:30+00:00 marha marha@users.sourceforge.net 2013-11-08T10:47:30+00:00 urn:sha1:c8483dc2831dc37d93a36804022f6b064f5962ea 64-bit compilation now compiles and runs 2013-07-25T06:25:18+00:00 marha marha@users.sourceforge.net 2013-07-24T12:25:51+00:00 urn:sha1:de54c5b749b3eefb75d420840c889533a58aa342 Use freetype 2.5.1 library in makefile 2013-06-21T10:38:57+00:00 marha marha@users.sourceforge.net 2013-06-21T10:38:57+00:00 urn:sha1:69aec3395435c636dea14ad5e893a0ceeb47baa8 xrdb now compiles and links 2013-04-15T07:50:01+00:00 marha marha@users.sourceforge.net 2013-04-15T07:50:01+00:00 urn:sha1:e50b38aebb733934db7ef3ec13c330407afd9ada Updated version of freetype in makefiles and project files 2013-02-13T09:01:58+00:00 marha marha@users.sourceforge.net 2013-02-13T09:01:58+00:00 urn:sha1:11e66a9a49dacd4e1a88348ff1a3270f0090eca8 Solved problem of mesa dll not being build anymore. 2012-10-31T08:39:45+00:00 marha marha@users.sourceforge.net 2012-10-31T08:39:45+00:00 urn:sha1:7c531937cfab42f2fd3233c096c409ebdd5b59af File name checking is case sensitive in mhmake Now create a seperate installer for the debug exe and dlls 2012-10-30T14:11:32+00:00 marha marha@users.sourceforge.net 2012-10-30T14:11:32+00:00 urn:sha1:5bda4b6582522d21b15d62c5c76c71104e924cbc