diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:04:18 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:04:18 +0200 |
| commit | 20b18fd799e2ea9d0651f3ef913dd9ce2e481471 (patch) | |
| tree | 86867a1128f35087f37d4b49ecf241b7b8e6b38e /Makefile.am | |
| parent | c5f7d08b8c3d4287dd40bbdf52525add8f5cee20 (diff) | |
| parent | e4359af463463097dd80e679836905bcd8ad7a13 (diff) | |
| download | openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.tar.gz openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.tar.xz openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.zip | |
Merge branch 'svn-branch-2.1' into merge
Pulling in changes from James' 2.1/openvpn branch in SVN.
Conflicts:
buffer.c
init.c
manage.h
multi.c
openvpn.8
options.c
ssl.c
version.m4
win/sign.py
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f311837..32b40bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,9 @@ openvpn_SOURCES = \ basic.h \ buffer.c buffer.h \ circ_list.h \ + clinat.c clinat.h \ common.h \ + config-win32.h \ crypto.c crypto.h \ dhcp.c dhcp.h \ errlevel.h \ |