From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 640B01380DC for ; Wed, 5 Feb 2014 04:38:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 619F4E0AD9; Wed, 5 Feb 2014 04:38:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00DC3E0AD9 for ; Wed, 5 Feb 2014 04:38:34 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22EE933F912 for ; Wed, 5 Feb 2014 04:38:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 872D618888 for ; Wed, 5 Feb 2014 04:38:32 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1391575093.d4296028031b43115b922b13a6154164ce0a3a26.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: d4296028031b43115b922b13a6154164ce0a3a26 X-VCS-Branch: master Date: Wed, 5 Feb 2014 04:38:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 95df9760-abdc-466e-bee6-41092d60622c X-Archives-Hash: f107f01a65d4bcced4caed6db1382dd1 commit: d4296028031b43115b922b13a6154164ce0a3a26 Author: Nicolas Bock gmail com> AuthorDate: Wed Feb 5 04:38:13 2014 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Feb 5 04:38:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4296028 Merge branch 'master' of github.com:gentoo-science/sci Conflicts: sci-physics/lammps/ChangeLog sci-physics/lammps/lammps-20140201.ebuild sci-physics/lammps/ChangeLog | 4 ++-- sci-visualization/visit/visit-2.7.1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)