Merge branch 'config' into test
authorGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Wed, 25 Jan 2012 22:17:22 +0000 (20:17 -0200)
committerGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Wed, 25 Jan 2012 22:24:25 +0000 (20:24 -0200)
commit628a4aee8129d510d50ccde32168dffe2c2ed73c
tree8653f7f3ddfa3e2c63c41a2a8f07d9c997c177a4
parent7d757331d629305feb7bf6e85f37d340cf771845
parent42c9d87245513799978133b8303851a852c1f328
Merge branch 'config' into test

Conflicts:
TODO
src/host/hoststatusanalyzer.h
src/icmp/icmppacket.h
src/main.cpp
15 files changed:
Readme
Readme.code
TODO
src/CMakeLists.txt
src/dns/dnsresolver.h
src/host/hoststatusanalyzer.h
src/host/pinger.h
src/host/pingprotocol.cpp
src/host/pingprotocol.h
src/host/pingscheduler.h
src/icmp/icmppacket.h
src/icmp/icmptype.h
src/icmp/icmpv6packet.cpp
src/main.cpp
test/mock_linkstatusanalyzer.h