diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-22 23:29:34 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-10-21 21:27:16 +0200 |
| commit | 6cc43bf573700b2391ae462651190a3b209da2c8 (patch) | |
| tree | 1545a60a71ddcbaf1bd65c279b7d79f0a8362737 /contrib/openvpn-fwmarkroute-1.00 | |
| parent | 238f81b9097c6ec70be3080b23cce46ad635e54c (diff) | |
| download | openvpn-6cc43bf573700b2391ae462651190a3b209da2c8.tar.gz openvpn-6cc43bf573700b2391ae462651190a3b209da2c8.tar.xz openvpn-6cc43bf573700b2391ae462651190a3b209da2c8.zip | |
Solved hidden merge conflict between feat_misc and bugfix2.1
The OCSP patch (commit a3982181e284f8c5c8f, feat_misc) introduced
a new function which was calling create_temp_filename(). When merging
in bugfix2.1 into allmerged, create_temp_filename() got renamed to
create_temp_file() in commit 5d30273a8741d2c141.
This patch only changes create_temp_filename() to create_temp_file()
in the new function introduced by commit a3982181e284f8c5c8f.
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
(cherry picked from commit 926d1662e4d9e14b50eddec993b2f4e0209c0646)
Diffstat (limited to 'contrib/openvpn-fwmarkroute-1.00')
0 files changed, 0 insertions, 0 deletions