1 |
commit: d4296028031b43115b922b13a6154164ce0a3a26 |
2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Feb 5 04:38:13 2014 +0000 |
4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Feb 5 04:38:13 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4296028 |
7 |
|
8 |
Merge branch 'master' of github.com:gentoo-science/sci |
9 |
|
10 |
Conflicts: |
11 |
sci-physics/lammps/ChangeLog |
12 |
sci-physics/lammps/lammps-20140201.ebuild |
13 |
|
14 |
|
15 |
sci-physics/lammps/ChangeLog | 4 ++-- |
16 |
sci-visualization/visit/visit-2.7.1.ebuild | 4 ++-- |
17 |
2 files changed, 4 insertions(+), 4 deletions(-) |