14 Commits

Author SHA1 Message Date
Thomas Bernard
06764123fb Merge remote branch 'origin/master' into portinuse
Conflicts:
	miniupnpd/Makefile.linux
	miniupnpd/natpmp.c
2014-03-13 14:19:44 +01:00
Thomas Bernard
b01152666c Adding Daniel Becker to thanks list 2014-03-12 09:04:47 +01:00
Thomas Bernard
3997a2ebe7 README: Add Peter Tatrai to thanks list 2014-01-14 09:25:54 +01:00
Thomas Bernard
a93393df44 update README's to include PCP 2014-01-14 09:25:19 +01:00
Thomas Bernard
9b72af6f36 Merge branch 'master' into portinuse 2013-12-13 12:29:01 +01:00
Thomas Bernard
d19048ef9e miniupnpd: Make all manufacturer info configurable 2013-12-13 12:03:28 +01:00
Thomas Bernard
91f34d6c38 Merge branch 'master' into portinuse
Conflicts:
	README
2013-02-07 16:48:16 +01:00
Thomas Bernard
229dff6ff4 Added Leah X. Schmidt 2013-02-06 19:27:59 +01:00
Thomas Bernard
58cc14aff4 README: add Jardel Weyrich 2012-09-28 10:58:48 +02:00
Thomas Bernard
013b0df388 miniupnpd: detect port in use / already forwarded
Patch submitted by David Kerr
2012-07-10 23:25:29 +02:00
Thomas Bernard
49e82de60d Add Chiaki Ishikawa to thanks list 2012-04-26 20:33:42 +02:00
Jardel Weyrich
567808b8cd Fix typo. 2012-02-01 22:47:22 -02:00
Thomas Bernard
e09da9f860 update README files 2012-01-25 22:33:08 +01:00
Thomas Bernard
a5fec269f9 first commit 2011-09-27 22:20:10 +02:00