This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenVPN with experimental and new features - which requires a lot of testing".
The branch, allmerged has been updated
via 7695ad84e29e1c23fb3e9d9c7c84cf6f13783b68 (commit)
from bd948f27a9aba46db03a7312be5fd035ca859401 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7695ad84e29e1c23fb3e9d9c7c84cf6f13783b68
Author: David Sommerseth <da...@us...>
Date: Thu Apr 22 23:29:34 2010 +0200
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 <da...@us...>
-----------------------------------------------------------------------
Summary of changes:
ssl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
OpenVPN with experimental and new features - which requires a lot of testing
|