Stefan Wahren 5a7e69f90d Merge remote branch 'upstream/master' ...

Conflicts:
	mbus/mbus-serial.c

2012-05-14 00:09:05 +02:00

..

Makefile.am

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00

Makefile.in

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00

mbus-protocol-aux.c

fix bug in breakout of loop due to max_frames condition

2012-05-13 16:32:17 +09:00

mbus-protocol-aux.h

Added new function to generate XML with normalized values

2012-05-06 23:00:59 +02:00

mbus-protocol.c

Merge remote branch 'upstream/master'

2012-05-14 00:09:05 +02:00

mbus-protocol.h

Added 2 event callbacks to handle send and receive events outside the

2012-05-13 23:57:24 +02:00

mbus-serial.c

Merge remote branch 'upstream/master'

2012-05-14 00:09:05 +02:00

mbus-serial.h

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00

mbus-tcp.c

Added 2 event callbacks to handle send and receive events outside the

2012-05-13 23:57:24 +02:00

mbus-tcp.h

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00

mbus.c

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00

mbus.h

got rid of duplicate catalog libmbus/libmbus

2012-04-15 10:51:15 +09:00