David Zeuthen 137ea12109 Fix merge conflicts

2010-12-20 11:55: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

Start implementing the Date and Time mockups

2010-10-13 17:53:26 -04:00

ui

Fix merge conflicts

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

Makefile.am

Fix merge conflicts

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