| commit | 6bd687e0f27e180944f7f8dbc74f820ac9377f4f | [log] [tgz] |
|---|---|---|
| author | Zachary Ware <zachary.ware@gmail.com> | Thu Apr 09 20:20:55 2015 -0500 |
| committer | Zachary Ware <zachary.ware@gmail.com> | Thu Apr 09 20:20:55 2015 -0500 |
| tree | 67d4cf03e8784a1eefbe7f5be1b031cebee8a868 | |
| parent | 5056769b36901598b9eb3900a44839284e782b14 [diff] | |
| parent | 057b5300244ca6ed2473125dabad2b553563e84d [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.