Merge branch 'stable' into pud
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 13 Jan 2012 18:41:45 +0000 (19:41 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 13 Jan 2012 18:41:45 +0000 (19:41 +0100)
commitff8a1ea9e96c56d678c65e2f773d2107ee522942
tree6ebcf1c8550383a84f9ad5c25fd7f96ff24cde53
parent2906e55de8ebfb8a66b48bc1ad856b89422c4e88
parent008140241a3e04ddd11420304bf3e0f8eabbd2db
Merge branch 'stable' into pud

* stable:
  p2pd: dump_packet is only used within the INCLUDE_DEBUG_OUTPUT define
  httpinfo: dynamic_files is only used within the ADMIN_INTERFACE define
  linux-gtk: link is unused, comment it out
  linux-gtk: fix a warning about a missing break statement
  linux-gtk: include glib.h too
  linux-gtk: also remove olsrd-gui on clean
  linux-gtk: link with libm
  linux-gtk: .gitignore the compiled program