clean merge conflict
[themes.git] / LCARStrek / mozapps / pref /
2008-10-16 Robert Kaiserupdate LCARStrek to 2.0a1, part 4: mozapps, navigator
2003-10-13 robertupdating firebird support to trunk, adding missed files