aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version string to 1.17.0.0-1Mike DePaulo2015-05-095-7/+7
| | | | I would make it 1.17.0.1, but upstream might release that version.
* XWin.rc & dix-config.h: Update for X2Go/ArcticaMike DePaulo2015-05-092-5/+5
|
* Update README.md for 1.15.2.6Mike DePaulo2015-05-091-5/+5
| | | | | Conflicts: README.md
* Update URLs in "About"Mike DePaulo2015-05-091-2/+2
| | | | | Conflicts: xorg-server/hw/xwin/XWin.rc
* Do not make the font files differ each time due to timestamp differencesMike DePaulo2015-05-091-0/+6
| | | | | Conflicts: releasenotes/releasenote_1.15.2.6.x2go+arctica.txt
* Add extra info to installer and change nameMike DePaulo2015-05-094-36/+60
| | | | | | | | | Conflicts: packages.txt xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi
* README.md Add community & Professional SupportMike DePaulo2015-05-091-0/+10
|
* uninstaller: Remove the entire VcXsrv directoryMike DePaulo2015-05-092-86/+4
| | | | | | | (GitHub Issue #1) Conflicts: releasenotes/releasenote_1.15.2.5.txt
* Change name to: VcXsrv (X2Go/Arctica Builds)Mike DePaulo2015-05-095-7/+7
| | | | | | | | | Conflicts: xorg-server/hw/xwin/XWin.rc xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi
* Merge branch 'release/external-1.17.0.0-x' into release/1.17.0.0-xMike DePaulo2015-05-0926-772/+857
|\
| * Updated to libXfont 1.5.1Mike DePaulo2015-05-0925-768/+842
| | | | | | | | | | | | | | | | In addition to some other changes, the following CVEs have been fixed: bdfReadProperties: property count needs range check [CVE-2015-1802] bdfReadCharacters: bailout if a char's bitmap cannot be read [CVE-2015-1803] bdfReadCharacters: ensure metrics fit into xCharInfo struct [CVE-2015-1804]
| * Update packages.txt about to list putty, and to list its version (svn 10285 ↵Mike DePaulo2015-05-091-0/+1
| | | | | | | | with CVE-2015-2157 fix)
| * Add some missing smemclrs and sfrees.Simon Tatham2015-05-091-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The absence of these could have prevented sensitive private key information from being properly cleared out of memory that PuTTY tools had finished with. Thanks to Patrick Coleman for spotting this and sending a patch. Origin: upstream, http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=65f69bca7363ceceeac515ae2a82b8f8adc6404d Bug: http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/private-key-not-wiped-2.html Bug-Debian: http://bugs.debian.org/779488 Patch-Name: private-key-not-wiped-2.patch
* | Update README.md about new branch namesMike DePaulo2015-05-091-3/+3
| | | | | | | | These branch names are based on the X2Go convention for branch names.
* | README.md: typoMike DePaulo2015-05-091-1/+1
| |
* | README.md: Add explanation of branchesMike DePaulo2015-05-091-2/+11
| |
* | Current version is 1.15.2.4-xp+vc2013+x2go1Mike DePaulo2015-05-091-2/+4
| |
* | Delete buildall.bat. It hasn't been working for a while.Mike DePaulo2015-05-091-44/+0
| |
* | Create README.mdMike DePaulo2015-05-091-0/+48
| |
* | Now using: VS Express -> VS Community Edition.Mike DePaulo2015-05-091-2/+1
| | | | | | | | | | | | Also, community edition is supposed to have the same features as Professional, so we can safely assume that Professional and other commercial editions will work fine.
* | VS 2013 Update 3 -> VS 2013 Update 4Mike DePaulo2015-05-091-1/+1
| |
* | Correct building.txt in terms of PythonMike DePaulo2015-05-091-3/+4
| |
* | Call makensis.exe from the PATHMike DePaulo2015-05-091-14/+4
| |
* | Incorporate winmultiwindow.patch from Oleksandr Shneyder (phoca GmbH)Mike DePaulo2015-05-091-1/+48
| |
* | Update buildall.bat to work with VS express edition. Note that I am not ↵Mike DePaulo2015-05-091-5/+5
| | | | | | | | using buildall.bat to build currently.
* | Call setvcenv.sh from buildall.shMike DePaulo2015-05-092-1/+2
| |
* | Specify that buildall.sh should be called, not buildall.bat.Mike DePaulo2015-05-091-1/+1
| |
* | Build was successful. Update building.txt for Python 3, which is now required.Mike DePaulo2015-05-091-1/+2
| |
* | Fix build of mhmakeMike DePaulo2015-05-091-7/+5
| |
* | Additional changes for XP targeting. From [1b493f] on the xp-fixesonly branch.Mike DePaulo2015-05-092-142/+142
| |
* | Update building.txt, you need to decide which build script to useMike DePaulo2015-05-091-1/+1
| |
* | Initial work to get VcXsrv 1.15.2.0 to compile under the MSVC2013 XP targetMike DePaulo2015-05-097-38/+62
| |
* | Updated mesa 32-bit project options1.17.0.0marha2015-05-033-12/+12
| |
* | Increased version to 1.17.0.0marha2015-04-307-22/+1231
| |
* | Merge remote-tracking branch 'origin/released'marha2015-04-30105-531/+1845
|\|
| * fontconfig pixman libX11 mesa git update 30 Apr 2015marha2015-04-30103-531/+1783
| | | | | | | | | | | | | | libX11 commit d3415d1f052530760b4617db45affcb984cfe35c pixman commit e0c0153d8e5d42c08c2b9bd2cf2123bff2c48d75 fontconfig commit 4a6f5efd5f6a468e1872d58e589bcf30ba88e2fd mesa commit 1ac7db07b363207e8ded9259f84bbcaa084b8667
* | Merge remote-tracking branch 'origin/released'marha2015-04-20132-3562/+2550
|\| | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl 1.0.2amarha2015-04-20133-3563/+2551
| |
* | Merge remote-tracking branch 'origin/released'marha2015-04-20338-9822/+16337
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * randrproto xkeyboard-config fontconfig libX11 libXdmcp libXmu pixman ↵marha2015-04-20325-5731/+11685
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xkbcomp xserver mesa git update 20 Apr 2015 xserver commit b1029716e41e252f149b82124a149da180607c96 xkeyboard-config commit 7d00bcc2d9c3944bbdfcbe472ee3299729dc7687 libX11 commit 748d47e69f5c12d8557d56a8a8ec166588da7b93 libXdmcp commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6 xkbcomp commit 1ae525b3d236b59e6437b2b5433d460e18370973 pixman commit 58e21d3e45c5227c2ca9ac00cf044f22a7975180 randrproto commit 98da0d6e48b7d124d6788ea568e9f9e3dc204322 libXmu commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62 fontconfig commit 07be485a0a84995ce69bf60e3b1bb22cb35f6b0e mesa commit c1485f4b7d044724b3dbc1011f3c3a8a53132010
* | Solved hang-up problem during closingmarha2015-04-033-24/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2015-03-22160-6044/+8407
|\| | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c
| * randrproto fontconfig libX11 libXdmcp libxcb mesa xkbcomp xserver git update ↵marha2015-03-22150-2155/+3979
| | | | | | | | | | | | | | | | | | | | | | | | | | 22 Mar 2015 xserver commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 libxcb commit a90be9955d2c5a635f791d44db1154633b9d3322 libX11 commit 5a499ca7b064bf7e6a4fcc169f22862dce0c60c5 libXdmcp commit 0c09444d276fbf46a0e8b427a4f6a325d0625742 xkbcomp commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 randrproto commit b1ba68df8a5fc113a387123ec2f312195e28e47f fontconfig commit 69ff6b6e260584e383c38b1b7034ddcbb23d214f mesa commit 397b491173f0d2df4deb44d21c170bf16840d507
* | Merge remote-tracking branch 'origin/released'marha2015-03-05361-6892/+7621
|\| | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/queryobj.c
| * fontconfig mesa git update 5 Mar 2015marha2015-03-05350-6882/+3372
| |
* | Solved mesa compilation problemsmarha2015-03-051-0/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2015-02-2418-0/+5567
|\|
| * Added missing files for mesamarha2015-02-2418-0/+5567
| |
* | Merge remote-tracking branch 'origin/released'marha2015-02-2455-760/+42723
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added libXfixes-5.0marha2015-02-2231-0/+41753
| |