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

Conflicts:
	mbus/mbus-serial.c

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

..

electricity-meter-1.hex

got rid of duplicate catalog libmbus/libmbus

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

electricity-meter-1.xml

got rid of duplicate catalog libmbus/libmbus

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

electricity-meter-2.hex

got rid of duplicate catalog libmbus/libmbus

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

electricity-meter-2.xml

got rid of duplicate catalog libmbus/libmbus

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

frame1.hex

got rid of duplicate catalog libmbus/libmbus

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

frame1.xml

Merge remote branch 'upstream/master'

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

frame2.hex

got rid of duplicate catalog libmbus/libmbus

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

frame2.xml

got rid of duplicate catalog libmbus/libmbus

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

kamstrup_multical_601.hex

got rid of duplicate catalog libmbus/libmbus

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

kamstrup_multical_601.xml

Merge remote branch 'upstream/master'

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

manual_frame2.hex

got rid of duplicate catalog libmbus/libmbus

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

manual_frame2.xml

got rid of duplicate catalog libmbus/libmbus

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

manual_frame3.hex

got rid of duplicate catalog libmbus/libmbus

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

manual_frame3.xml

got rid of duplicate catalog libmbus/libmbus

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

manual_frame7.hex

got rid of duplicate catalog libmbus/libmbus

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

manual_frame7.xml

got rid of duplicate catalog libmbus/libmbus

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

svm_f22_telegram1.hex

got rid of duplicate catalog libmbus/libmbus

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

svm_f22_telegram1.xml

Merge remote branch 'upstream/master'

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