Florian Müllner 8bc396a7e0 Adjust for merging commit 24f1e87 ...

Signed-off-by: David Zeuthen <davidz@redhat.com>

2011-01-19 11:08:36 -05:00

..

misc

Bluetooth status indicator

2010-12-18 19:10:15 +01:00

perf

Use non recursive automake for JS

2010-09-15 18:38:46 +02:00

prefs

Adjust for merging commit 24f1e87

2011-01-19 11:08:36 -05:00

ui

Adjust for merging commit 24f1e87

2011-01-19 11:08:36 -05:00

Makefile.am

Fix merge conflicts

2010-12-20 11:55:36 -05:00