Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF7599306 for ; Tue, 3 Jan 2012 18:41:04 +0000 (UTC) Received: (qmail 53679 invoked by uid 500); 3 Jan 2012 18:41:04 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 53655 invoked by uid 500); 3 Jan 2012 18:41:04 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 53648 invoked by uid 99); 3 Jan 2012 18:41:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 18:41:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 18:41:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0199B3156D8; Tue, 3 Jan 2012 18:39:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pmuellr@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [25/27] git commit: Merge pull request #26 from pmuellr/issue/25 Message-Id: <20120103183932.0199B3156D8@tyr.zones.apache.org> Date: Tue, 3 Jan 2012 18:39:31 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #26 from pmuellr/issue/25 Issue/25 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/commit/1e50ade6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/tree/1e50ade6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/diff/1e50ade6 Branch: refs/heads/master Commit: 1e50ade6c0b11ac76f68377d10f3ff822f4adbc5 Parents: 4f268d2 a36a38d Author: Patrick Mueller Authored: Sat Aug 13 15:56:16 2011 -0700 Committer: Patrick Mueller Committed: Sat Aug 13 15:56:16 2011 -0700 ---------------------------------------------------------------------- weinre.server/src/weinre/server/Channel.java | 22 ++++++++ weinre.server/src/weinre/server/Main.java | 20 ++++++++ .../src/weinre/server/MessageHandler.java | 10 ++++ .../src/weinre/server/ServerSettings.java | 38 ++++++++++++++- 4 files changed, 88 insertions(+), 2 deletions(-) ----------------------------------------------------------------------