Andy Kittner 5979b23b04 Merge remote-tracking branch 'origin/master' into bug-409 ... Conflicts: openslides/main.py		2012-11-24 20:49:04 +01:00
..
benchmark	changle end of line to windows for some files	2012-07-20 10:55:07 +02:00
logo	Added eps file of logo (wide variante).	2012-07-12 16:50:56 +02:00
scripts	added script to create a local settings	2012-11-24 16:22:48 +01:00
win32-portable	Copy _ctypes.pyd	2012-11-24 15:01:54 +01:00