Merge commit '97b86324d322309843cc5d9d93b039d706c5ae58' into mm
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:55:28 +0000 (15:55 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:55:28 +0000 (15:55 +0100)
commit9dd57f8a1bb06dd0af0218d950faf7cbebd2cc1c
tree03caa80fb58bf6b5973709ce12ffd891da5cedc6
parentbc8b4b245996012732adc068412b467f43c15ee8
parent97b86324d322309843cc5d9d93b039d706c5ae58
Merge commit '97b86324d322309843cc5d9d93b039d706c5ae58' into mm

Conflicts:
configure.ac
lib/Makefile.am
lib/components/Makefile.am
lib/gdi/font.cpp
lib/gdi/font.h
main/Makefile.am
configure.ac
lib/Makefile.am
lib/base/Makefile.am
lib/components/Makefile.am
lib/dvb/Makefile.am
lib/gdi/font.cpp
lib/gdi/font.h
lib/network/Makefile.am