Merge commit '567cdcb4aca0b40ec7017459642f135d6139e585' into mm
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:30:50 +0000 (15:30 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:30:50 +0000 (15:30 +0100)
commit8899065fb5777779a30b2449d4a76bfe0c0b6514
tree2898ed8cecbc2833dbf544c5b15b52863d3cad09
parent55e2d492a8f6fe89ebd15c9b5b9a706fc89e3425
parent567cdcb4aca0b40ec7017459642f135d6139e585
Merge commit '567cdcb4aca0b40ec7017459642f135d6139e585' into mm
configure.ac
lib/base/Makefile.am
lib/components/Makefile.am
lib/dvb/Makefile.am
main/Makefile.am
po/Makefile.am