Changeset 190:75d280708ff5 for siren

Timestamp:

11/29/08 00:48:18 (3 years ago)

Author:

cfreeze@…

Branch:

default

Parents:

189:8190540dae37 (diff), 185:c20e85874308 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

correct merge problems that are showing up from bad branching

Files:

• siren (modified) (1 diff)

siren

@@ -121 +121 @@
                 for state in conf.states:
                         log.info("State: " + state)
-                        xw = StormWeather(state,history,options.simfetch,options.simalert)
+                        xw = StormWeather(state,history,options.simfetch,options.simalert,conf.proxy)
                         #xw.display()
                         for dev in conf.devices: