]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5056769 057b530)
Merge with 3.4.
authorZachary Ware <zachary.ware@gmail.com>
Fri, 10 Apr 2015 01:20:55 +0000 (20:20 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Fri, 10 Apr 2015 01:20:55 +0000 (20:20 -0500)
commit6bd687e0f27e180944f7f8dbc74f820ac9377f4f
tree67d4cf03e8784a1eefbe7f5be1b031cebee8a868tree | snapshot
parent5056769b36901598b9eb3900a44839284e782b14commit | diff
parent057b5300244ca6ed2473125dabad2b553563e84dcommit | diff
Merge with 3.4.

The fix has moved in this branch.  Also, the opt-in is already available
on this branch; just set nasmDir when building.
PCbuild/openssl.props diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.