aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2015-04-2065-2819/+1320
|\ | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl 1.0.2amarha2015-04-2065-2819/+1320
| |
| * Upgraded to openssl-1.0.2marha2015-02-22942-177203/+248359
| |
* | Merged origin/release (checked in because wanted to merge new stuff)marha2015-02-22941-177203/+248347
| |
* | Merge remote-tracking branch 'origin/released'marha2014-10-1941-239/+1073
|\| | | | | | | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
| * Update to openssl-1.0.1jmarha2014-10-1942-239/+1079
| |
* | Merge remote-tracking branch 'origin/released'marha2014-09-0272-4763/+2057
|\| | | | | | | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
| * Upgrade openssl to version openssl-1.0.1imarha2014-09-0273-4763/+2063
| |
* | Merge remote-tracking branch 'origin/released'marha2014-06-2623-47/+89
|\| | | | | | | | | | | | | | | * 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-2623-47/+89
| | | | | | | | | | | | | | | | | | | | | | | | 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-1417-29/+190
|\| | | | | | | | | | | | | Conflicts: openssl/Configure openssl/Makefile openssl/util/pl/VC-32.pl
| * Updated openssl to version 1.0.1gmarha2014-04-1417-29/+190
| |
* | Merge remote-tracking branch 'origin/released'marha2014-02-0756-621/+864
|\| | | | | | | | | | | | | | | | | * 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-0756-621/+864
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-13105-392/+1004
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-13105-392/+1004
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Merge remote-tracking branch 'origin/released'marha2012-06-1530-140/+257
|\| | | | | | | | | | | Conflicts: freetype/src/raster/ftraster.c openssl/Makefile
| * Updated to following packages:marha2012-06-1530-140/+257
| | | | | | | | | | | | freetype-2.4.10 libXaw-1.0.11 openssl-1.0.1c
* | Merge remote-tracking branch 'origin/released'marha2012-04-10372-3917/+62272
|\| | | | | | | | | | | | | | | | | 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-10373-3917/+62284
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2717-146/+347
|\| | | | | | | | | Conflicts: openssl/Makefile
| * update to openssl 1.0.0gmarha2012-01-2717-146/+347
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-3036-478/+839
|\| | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl-1.0.0emarha2011-09-3036-478/+839
| |
* | Synchronised line endinge with release branchmarha2011-09-1219-15043/+15043
| |
* | Added gitignore filesmarha2011-05-301-0/+2
| |
* | svn merge ^/branches/released .marha2011-04-1319-14971/+15043
|\|
| * Updated to openssl-1.0.0dmarha2011-04-1319-89/+161
| |
* | svn merge ^/branches/released .marha2011-01-2368-510/+838
|\|
| * Updated to openssl-1.0.0cmarha2011-01-2368-510/+838
| |
* | svn merge ^/branches/released .marha2010-06-1728-223/+374
|\|
| * Switched to openssl-1.0.0amarha2010-06-1628-223/+374
| |
| * Updated to openssl 1.0.0marha2010-03-29620-28582/+54690
| |
* | svn merge -r514:HEAD ^/branches/released .marha2010-03-30619-28536/+54682
| |
* | svn merge ^/branches/releasedmarha2009-12-224-3/+27
|\|
| * Switched to openssl-0.9.8lmarha2009-12-214-3/+27
| |
* | openssl: Removed automatic generated files from version control.marha2009-08-041-259/+0
| |
* | Changes for VC compilationmarha2009-07-121-4/+8
|/
* Files not added in initial commitmarha2009-07-123-0/+5424
|
* Checked in the following released items:marha2009-06-28992-0/+287289
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