diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-11-20 11:05:41 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-11-20 11:05:41 +0900 |
commit | 46acebe4a0a93375e76c9a98481d03b64adfe357 (patch) | |
tree | 4f1be720b4c799827abf16f94e32e74242106106 /tdm/config.def | |
parent | a1125663869f976934e166f6612d235826a2fd51 (diff) | |
parent | 154df4875e51f83f64b4c3f431867de79c1707fb (diff) | |
download | tdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.tar.gz tdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdm/config.def')
-rw-r--r-- | tdm/config.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdm/config.def b/tdm/config.def index cea1d7147..29a023a7f 100644 --- a/tdm/config.def +++ b/tdm/config.def @@ -1342,7 +1342,7 @@ Description: Key: ServerTimeout Type: int -Default: 15 +Default: 60 User: core Instance: #:*/ Comment: |