[565] in BarnOwl Developers
[D-O-H] r682 - / branches/par
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:29 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 25 Mar 2007 12:53:16 -0400 (EDT)
Author: nelhage
Date: 2007-03-25 12:53:16 -0400 (Sun, 25 Mar 2007)
New Revision: 682
Modified:
/
branches/par/perlwrap.pm
Log:
r20654@phanatique: nelhage | 2007-03-25 12:52:59 -0400
That line doesn't need to be there twice -- probably a mismerge
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20653
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20654
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
Modified: branches/par/perlwrap.pm
===================================================================
--- branches/par/perlwrap.pm 2007-03-25 16:53:11 UTC (rev 681)
+++ branches/par/perlwrap.pm 2007-03-25 16:53:16 UTC (rev 682)
@@ -420,6 +420,7 @@
eval {
BarnOwl::ModuleLoader->load_all;
};
+ BarnOwl::error("Error loading modules: $@") if $@;
} else {
BarnOwl::error("Can't load BarnOwl::ModuleLoader, loadable module support disabled:\n$@");
}
@@ -475,8 +476,6 @@
BarnOwl::_create_style("default", "BarnOwl::Style::Default::format_message", "Default style");
-BarnOwl::_create_style("default", "BarnOwl::Style::Default::format_message", "Default style");
-
################################################################################
sub time_hhmm {
