aboutsummaryrefslogtreecommitdiff
path: root/openssl
Commit message (Collapse)AuthorAgeFilesLines
* Update to openssl-1.0.2cmarha2015-06-22236-1523/+4319
| | | | | Conflicts: openssl/Makefile
* Additional changes for XP targeting. From [1b493f] on the xp-fixesonly branch.Mike DePaulo2015-05-091-4/+4
|
* Merge remote-tracking branch 'origin/released'marha2015-04-20131-3561/+2549
|\ | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl 1.0.2amarha2015-04-20132-3562/+2550
| |
| * Upgraded to openssl-1.0.2marha2015-02-221442-286406/+372758
| |
* | Merged origin/release (checked in because wanted to merge new stuff)marha2015-02-221440-286383/+372721
| |
* | Merge remote-tracking branch 'origin/released'marha2014-10-1992-675/+2018
|\| | | | | | | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
| * Update to openssl-1.0.1jmarha2014-10-1994-676/+2025
| |
* | Merge remote-tracking branch 'origin/released'marha2014-09-02173-5991/+3405
|\| | | | | | | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
| * Upgrade openssl to version openssl-1.0.1imarha2014-09-02175-5994/+3414
| |
* | Merge remote-tracking branch 'origin/released'marha2014-06-26196-197/+960
|\| | | | | | | | | | | | | | | * origin/released: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 Conflicts: openssl/Makefile
| * Opdated to openssl-1.0.1hmarha2014-06-26197-198/+961
| | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 xserver commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37 libxcb commit 125135452a554e89e49448e2c1ee6658324e1095 libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38 xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca libX11 commit a4679baaa18142576d42d423afe816447f08336c fontconfig commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1 mesa commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
* | Merge remote-tracking branch 'origin/released'marha2014-04-1464-109/+421
|\| | | | | | | | | | | | | Conflicts: openssl/Configure openssl/Makefile openssl/util/pl/VC-32.pl
| * Updated openssl to version 1.0.1gmarha2014-04-1465-113/+425
| |
* | Merge remote-tracking branch 'origin/released'marha2014-02-07112-1362/+2023
|\| | | | | | | | | | | | | | | | | * origin/released: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Conflicts: mesalib/src/glsl/glcpp/glcpp.c openssl/Makefile
| * xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa ↵marha2014-02-07113-1364/+2026
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
* | 64-bit compilation now compiles and runsmarha2013-07-256-15/+43
| |
* | Added NUL to ignoremarha2013-02-131-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-13180-891/+2698
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Update to following packages: Conflicts: freetype/src/autofit/afhints.c freetype/src/autofit/afmodule.c freetype/src/psaux/psconv.c freetype/src/sfnt/sfntpic.h openssl/Makefile openssl/util/pl/VC-32.pl
| * Update to following packages:marha2013-02-13181-894/+2701
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Now the software can be compiled from inside a cygwin terminalmarha2012-11-201-6/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1558-249/+559
|\| | | | | | | | | | | Conflicts: freetype/src/raster/ftraster.c openssl/Makefile
| * Updated to following packages:marha2012-06-1559-252/+562
| | | | | | | | | | | | freetype-2.4.10 libXaw-1.0.11 openssl-1.0.1c
* | Merge remote-tracking branch 'origin/released'marha2012-04-10485-5822/+72488
|\| | | | | | | | | | | | | | | | | Conflicts: openssl/Configure openssl/Makefile openssl/crypto/opensslconf.h openssl/util/mk1mf.pl openssl/util/pl/VC-32.pl
| * Update to openssl-1.0.1marha2012-04-10487-5837/+72557
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2754-212/+656
|\| | | | | | | | | Conflicts: openssl/Makefile
| * update to openssl 1.0.0gmarha2012-01-2755-213/+657
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-30206-1744/+3570
|\| | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl-1.0.0emarha2011-09-30207-1745/+3571
| |
* | Synchronised line endinge with release branchmarha2011-09-1242-43446/+43446
| |
* | Added gitignore filesmarha2011-05-303-0/+14
| |
* | svn merge ^/branches/released .marha2011-04-1342-42997/+43446
|\|
| * Updated to openssl-1.0.0dmarha2011-04-1343-157/+606
| |
* | Enabled global optimisation in release buildmarha2011-01-312-10/+23
| | | | | | | | | | winmain : GetEnvironmentStrings return should be freed with FreeEnvironmentStrings
* | Solved compile time warningmarha2011-01-311-1/+1
| |
* | svn merge ^/branches/released .marha2011-01-23132-795/+1565
|\|
| * Updated to openssl-1.0.0cmarha2011-01-23133-796/+1564
| |
* | svn merge ^/branches/released .marha2010-06-1766-745/+1331
|\|
| * Switched to openssl-1.0.0amarha2010-06-1667-745/+1332
| |
| * Added some more needed files from mesa-7.8marha2010-04-122-0/+2
| |
| * Updated to openssl 1.0.0marha2010-03-291101-56731/+90251
| |
* | svn merge -r524:HEAD "^/branches/released" .marha2010-04-122-0/+2
| |
* | svn merge -r514:HEAD ^/branches/released .marha2010-03-301099-56459/+90104
| |
* | svn merge ^/branches/releasedmarha2009-12-2217-13/+67
|\|
| * Switched to openssl-0.9.8lmarha2009-12-2118-15/+69
| |
* | openssl: Removed automatic generated files from version control.marha2009-08-042-987/+0
| |
* | Changes in ms\nt.mak for doing a DEBUG build without running Configur again.marha2009-07-302-9/+65
| | | | | | | | | | Specify DEBUG=1 on the command line when running nmake. The output will be in the out32_d directory.
* | Changes for VC compilationmarha2009-07-122-8/+12
|/
* Files not added in initial commitmarha2009-07-1211-0/+5440
|
* Checked in the following released items:marha2009-06-282106-0/+526698
xkeyboard-config-1.4.tar.gz ttf-bitstream-vera-1.10.tar.gz font-alias-1.0.1.tar.gz font-sun-misc-1.0.0.tar.gz font-sun-misc-1.0.0.tar.gz font-sony-misc-1.0.0.tar.gz font-schumacher-misc-1.0.0.tar.gz font-mutt-misc-1.0.0.tar.gz font-misc-misc-1.0.0.tar.gz font-misc-meltho-1.0.0.tar.gz font-micro-misc-1.0.0.tar.gz font-jis-misc-1.0.0.tar.gz font-isas-misc-1.0.0.tar.gz font-dec-misc-1.0.0.tar.gz font-daewoo-misc-1.0.0.tar.gz font-cursor-misc-1.0.0.tar.gz font-arabic-misc-1.0.0.tar.gz font-winitzki-cyrillic-1.0.0.tar.gz font-misc-cyrillic-1.0.0.tar.gz font-cronyx-cyrillic-1.0.0.tar.gz font-screen-cyrillic-1.0.1.tar.gz font-xfree86-type1-1.0.1.tar.gz font-adobe-utopia-type1-1.0.1.tar.gz font-ibm-type1-1.0.0.tar.gz font-bitstream-type1-1.0.0.tar.gz font-bitstream-speedo-1.0.0.tar.gz font-bh-ttf-1.0.0.tar.gz font-bh-type1-1.0.0.tar.gz font-bitstream-100dpi-1.0.0.tar.gz font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz font-bh-100dpi-1.0.0.tar.gz font-adobe-utopia-100dpi-1.0.1.tar.gz font-adobe-100dpi-1.0.0.tar.gz font-util-1.0.1.tar.gz font-bitstream-75dpi-1.0.0.tar.gz font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz font-adobe-utopia-75dpi-1.0.1.tar.gz font-bh-75dpi-1.0.0.tar.gz bdftopcf-1.0.1.tar.gz font-adobe-75dpi-1.0.0.tar.gz mkfontscale-1.0.6.tar.gz openssl-0.9.8k.tar.gz bigreqsproto-1.0.2.tar.gz xtrans-1.2.2.tar.gz resourceproto-1.0.2.tar.gz inputproto-1.4.4.tar.gz compositeproto-0.4.tar.gz damageproto-1.1.0.tar.gz zlib-1.2.3.tar.gz xkbcomp-1.0.5.tar.gz freetype-2.3.9.tar.gz pthreads-w32-2-8-0-release.tar.gz pixman-0.12.0.tar.gz kbproto-1.0.3.tar.gz evieext-1.0.2.tar.gz fixesproto-4.0.tar.gz recordproto-1.13.2.tar.gz randrproto-1.2.2.tar.gz scrnsaverproto-1.1.0.tar.gz renderproto-0.9.3.tar.gz xcmiscproto-1.1.2.tar.gz fontsproto-2.0.2.tar.gz xextproto-7.0.3.tar.gz xproto-7.0.14.tar.gz libXdmcp-1.0.2.tar.gz libxkbfile-1.0.5.tar.gz libfontenc-1.0.4.tar.gz libXfont-1.3.4.tar.gz libX11-1.1.5.tar.gz libXau-1.0.4.tar.gz libxcb-1.1.tar.gz xorg-server-1.5.3.tar.gz