David Zeuthen 51481bed82 Fix merge conflicts ...

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

2010-11-30 11:11:10 -05:00

..

misc

Add function for finding urls in string

2010-11-24 02:24:43 +03: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-11-30 11:11:10 -05:00

Makefile.am

Fix merge conflicts

2010-11-30 11:11:10 -05:00