diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
| commit | 8367889e8467ce73b051aa8db64b0336aea8ed4b (patch) | |
| tree | 99578b1e6969d7eeb19b2578137c1c92de2fc49b /packet_id.c | |
| parent | Preparing for v2.2-beta3 (diff) | |
| parent | Version 2.1.3b (diff) | |
| download | openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.xz | |
Merge branch 'svn-BETA21' into beta2.2
Conflicts:
version.m4
- Reset version.m4 to a more neutral version number
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'packet_id.c')
0 files changed, 0 insertions, 0 deletions