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 mergiing svn
authorSandro Knauß <knauss@netzguerilla.net>
Sun, 07 Feb 2010 05:12:31 +0100
changeset 28 cf54cc3373f2
parent 27 e33b90f96e0f (current diff)
parent 25 7295e27e8c99 (diff)
child 29 49ffb1f6cdbf
merging mergiing svn
--- a/iro/MyIro_daemon	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/MyIro_daemon	Sun Feb 07 05:12:31 2010 +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	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/iro.py	Sun Feb 07 05:12:31 2010 +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	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/merlin_daemon	Sun Feb 07 05:12:31 2010 +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