| commit | 1c4806d1c00cf7214d677e050359c37e74febe10 | |
| author | David Edmondson <dme@dme.org> | |
| Mon, 1 Oct 2012 06:14:10 +0000 (1 07:14 +0100) | ||
| committer | David Edmondson <dme@dme.org> | |
| Mon, 1 Oct 2012 06:14:10 +0000 (1 07:14 +0100) | ||
| tree | 5a70b92fb83da82468264791ff551b1bf5709d62 | treesnapshot (tar.gz zip) |
| parent | 673db377d6f97569f2d3f46c0d89de790e3b0e25 | commitdiff |
| parent | 936a76fedf25b3eab1a64b6d3a99f19e50b23457 | commitdiff |
Merge branch 'master' of git://github.com/cernekee/ocproxy
Conflicts:
contrib/ports/unix/proj/ocvpn/ocvpn.c
Conflicts:
contrib/ports/unix/proj/ocvpn/ocvpn.c
| contrib/ports/unix/proj/ocvpn/Makefile | diff1 | diff2 | blobhistory |
| contrib/ports/unix/proj/ocvpn/ocvpn.c | diff1 | diff2 | blobhistory |