Sebastian Pipping 028d03456f Merge branch 'master' into display-threading ... Conflicts: client-barcode/freitagslib/network.py		2011-10-17 20:01:43 +02:00
client-barcode	Merge branch 'master' into display-threading	2011-10-17 20:01:43 +02:00
devel	moved map, added docs link	2011-10-15 03:49:43 +02:00
display-daemon	screensaver now implemented in python (too) including idle message per state.	2011-10-15 05:38:14 +02:00
k4ever	Fixed some api bugs	2011-10-15 04:06:01 +02:00
.gitignore	dont track the media/img folder	2011-10-12 23:56:29 +02:00