9325bacbfc
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/.gitignore
miniupnpc/Makefile
miniupnpc/miniupnpc.c
2014-11-13 11:02:28 +01:00
78d32ba012
Merge remote branch 'mikedld/remove-macosx-macro'
2014-06-16 10:54:03 +02:00
920845b107
Use built-in __APPLE__ macro instead of MACOSX
...
GCC and Clang on Mac OS have a built-in __APPLE__ macro. Use it instead of
manually-defined MACOSX.
2014-06-15 04:14:43 +03:00
f6774e3316
Rename STATICLIB macro to resolve natpmp/miniupnp conflict
...
Same macro name is used in both natpmp and miniupnp libraries so it's
impossble to link one statically and another dynamically. This patch
renames the macro to have library-specific name.
2014-06-01 13:22:35 +03:00
242aceceb4
miniupnpc/CMakeLists.txt: install portlistingparse.h upnpreplyparse.h
...
Was in Makefile, but forgotten in CMakeLists.txt
Fixes #68
2014-04-17 12:53:11 +02:00
c2273b584e
miniupnpc: API_VERSION incremented to 11
2014-04-14 17:48:50 +02:00
28cab3e219
miniupnpc: added argument remoteHost to UPNP_GetSpecificPortMappingEntry()
...
increment API_VERSION to 10
2014-01-31 14:32:00 +01:00
9c884d3848
miniupnpc: increment API_VERSION to 9
2012-06-24 00:49:09 +02:00
5e05f913e6
fixed miniupnpc/CMakeLists.txt
2012-06-20 23:13:03 +02:00
ef49e90d28
Prepare release of version 1.7 of both miniupnpc and miniupnpd
2012-05-24 18:26:39 +02:00
901a6a998b
update version
2012-05-09 23:31:37 +02:00
c183a72c46
Added miniupnpc
2011-09-27 22:25:35 +02:00
Thomas Bernard
Mike Gelfand