Mercurial Mercurial > iro.hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging svn
authorSandro Knauß <knauss@netzguerilla.net>
Fri, 27 Nov 2009 01:14:51 +0100
changeset 25 7295e27e8c99
parent 24 2119564de7a9 (diff)
parent 23 0180b538ed74 (current diff)
child 28 cf54cc3373f2
merging svn
iro/iro.py file | annotate | diff | comparison | revisions 
--- a/iro/MyIro_daemon	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/MyIro_daemon	Fri Nov 27 01:14:51 2009 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 NAME="IRO"
-DEAMON=/home/sandy/svn/daemon/MyIro
+DEAMON=/home/sandy/svn/iro/MyIro
 DEAMON_OPTS=""
 PID=/home/sandy/var/run/$NAME.pid
 
--- a/iro/iro.py	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/iro.py	Fri Nov 27 01:14:51 2009 +0100
@@ -118,8 +118,8 @@
     provider=manager.Providerlist()
     provider.add("sipgate", sip, ["sms", "fax", ])
     provider.add("smstrade", smstrade, ["sms", ])
-    provider.add("geonet", None, ["sms", "fax", ])
-    provider.add("fax.de", None, ["sms", "fax", ])
+    #provider.add("geonet", None, ["sms", "fax", ])
+    #provider.add("fax.de", None, ["sms", "fax", ])
     provider.add("localhost", localhost, ["mail", ])
     provider.setDefault("sms","smstrade")
     provider.setDefault("fax","sipgate")
--- a/iro/merlin_daemon	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/merlin_daemon	Fri Nov 27 01:14:51 2009 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 NAME="merlin"
-DEAMON=/home/sandy/svn/daemon/$NAME
+DEAMON=/home/sandy/svn/iro/$NAME
 DEAMON_OPTS="/home/sandy/svn/iro/MyIro_daemon"
 PID=/home/sandy/var/run/$NAME.pid
iro.hg