Lucas Pleß ec3620df77 Merge branch 'maint/henne' into maint/lp		2012-03-24 22:00:51 +01:00
..
java/de/ctdo/bunti	annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly	2012-03-21 23:43:00 +01:00
resources	annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly	2012-03-21 23:43:00 +01:00
webapp	views.js wasn't added to git - dunno why ;D	2012-03-23 02:59:58 +01:00