Merge branch 'master' into usbkb_sauter
authorBernhard Urban <lewurm@gmx.net>
Wed, 23 Sep 2009 15:42:23 +0000 (17:42 +0200)
committerBernhard Urban <lewurm@gmx.net>
Wed, 23 Sep 2009 15:42:23 +0000 (17:42 +0200)
commit59cd61cee0ebb13ed425654f9de96652c167c5cd
tree01a272b014e5df3edce49cc5a2952973f0699016
parent505298a9ae4bdce58a448aea253f7bf24b069406
parent22afc41a706dc6a3244fa748e593b8f8a238a83f
Merge branch 'master' into usbkb_sauter

Conflicts:
Makefile
gecko.c
hollywood.h
main.c
Makefile
hollywood.h
main.c