From patchwork Tue May 31 11:23:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org X-Patchwork-Id: 628145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 3rJrjL30Jcz9t41 for ; Tue, 31 May 2016 21:24:06 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 5F3F32265B; Tue, 31 May 2016 11:24:03 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from 127.0.1.12 (unknown [127.0.1.12]) by lists.osmocom.org (Postfix) with ESMTPA id 642BB22636; Tue, 31 May 2016 11:23:58 +0000 (UTC) Date: Tue, 31 May 2016 11:23:58 +0000 From: Neels Hofmeyr Message-ID: X-Gerrit-MessageType: newchange Subject: [PATCH] openbsc[master]: TEST: branch without conflict, on 'merge if neccessary' mode... X-Gerrit-Change-Id: Id9ea0ead92a0c4bf023ef058a416b43d329fb622 X-Gerrit-ChangeURL: X-Gerrit-Commit: 4c6e9faca0e9526f80ae445347ace5c8978a7eb4 MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: nhofmeyr@sysmocom.de Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" Review at https://gerrit.osmocom.org/138 TEST: branch without conflict, on 'merge if neccessary' mode, newest Change-Id: Id9ea0ead92a0c4bf023ef058a416b43d329fb622 --- M openbsc/src/libbsc/paging.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/38/138/1 diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c index 9ae28e0..1df056e 100644 --- a/openbsc/src/libbsc/paging.c +++ b/openbsc/src/libbsc/paging.c @@ -17,6 +17,8 @@ * */ +/* TEST COMMIT */ + /* * Relevant specs: * 12.21: