Merge branch 'test'
authorGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Mon, 20 Feb 2012 18:54:26 +0000 (16:54 -0200)
committerGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Mon, 20 Feb 2012 18:54:26 +0000 (16:54 -0200)
commit649bb55c827e8ac0308277441ea9047b286ffa87
tree628af4e9be3fc2ec4e608fdf1975e20cc3c49150
parenta547eb3cb07033a0ac48bbe3efc022243aac87fe
parent3625c0e544982518392b842162318db9a9840a1a
Merge branch 'test'

Conflicts:
src/config/configurationreader.cpp
src/config/configurationreader.h
src/host/messagepayload.cpp
src/link/linkstatus.h
src/main.cpp
src/tcp/tcpheader.cpp
18 files changed:
src/config/configuration.cpp
src/dns/dnsresolver.h
src/dns/hostaddress.h
src/dns/timetolive.h
src/host/hoststatus.cpp
src/host/messagepayload.cpp
src/host/pinger.h
src/host/pinginterval.h
src/host/pingscheduler.cpp
src/host/pingscheduler.h
src/icmp/icmppacket.h
src/icmp/icmptype.h
src/icmp/icmpv6packet.cpp
src/link/linkstatus.cpp
src/link/linkstatus.h
src/main.cpp
src/tcp/tcpheader.cpp
src/tcp/tcpheader.h