Franck Joncourt e515ba45fe Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	client/fwknop.8.in

2013-06-05 21:47:41 +02:00

..

cmd_opts.h

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

config_init.c

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

config_init.h

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

fwknop_common.h

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

fwknop.8.in

Merge remote-tracking branch 'upstream/master'

2013-06-05 21:47:41 +02:00

fwknop.c

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

fwknop.h

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

getpasswd.c

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

getpasswd.h

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00

http_resolve_host.c

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

log_msg.c

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

log_msg.h

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

Makefile.am

Inverted log level enumeration

2013-04-26 16:18:08 +02:00

spa_comm.c

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

spa_comm.h

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

utils.c

Updated copyright dates, removed NEWS file in favor of the ChangeLog

2013-06-02 14:07:01 -04:00

utils.h

Merge remote-tracking branch 'fjoncourt/master'

2013-06-02 22:54:23 -04:00