diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-14 23:48:49 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-14 23:48:49 +0100 |
| commit | 4b519cf51d02daacb388eb90bd0c5930145d7a0d (patch) | |
| tree | bb5427a758fe78816cdfdf19d05f0836fa68ac6a /otime.h | |
| parent | Merge branch 'feat_misc' into beta2.2 (diff) | |
| parent | Fixed compiling issues when using --disable-crypto (diff) | |
| download | openvpn-4b519cf51d02daacb388eb90bd0c5930145d7a0d.tar.xz | |
Merge branch 'bugfix2.1' into beta2.2
Conflicts:
options.c
- Disagreements about a new included file (forward.h)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'otime.h')
0 files changed, 0 insertions, 0 deletions