Steffen Vogel d2017e94a3 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org ... Conflicts: misc/controller/vzlogger/etc/vzlogger.conf misc/controller/vzlogger/src/protocols/1wire.c		2011-08-05 01:31:08 +02:00
..
controller	Merge branch 'master' of github.com:volkszaehler/volkszaehler.org	2011-08-05 01:31:08 +02:00
docs	moved standard files to project root (step toward official debian package)	2011-06-09 16:27:42 +02:00
frontend	updated submodules	2011-05-12 18:08:40 +02:00
graphics	added vz.org logo	2011-04-07 22:40:45 +02:00
sql	added hints for demo data	2011-02-24 18:07:41 +01:00
tests	updated year 2010 -> 2011	2011-04-07 00:01:41 +02:00
tools	applied Harald's patch - thx!	2011-06-25 04:09:22 +02:00