diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-22 23:29:34 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:57:22 +0200 |
| commit | 87b342b7b0adcdda9ba55056b9c9a8298e0cebff (patch) | |
| tree | 0fa747efb8dca59c3dcf3393090388dd3a796d34 /Makefile.am | |
| parent | Merge branch 'feat_ipv6_wintap' into beta2.2 (diff) | |
| download | openvpn-87b342b7b0adcdda9ba55056b9c9a8298e0cebff.tar.xz | |
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 'Makefile.am')
0 files changed, 0 insertions, 0 deletions