Merge remote-tracking branch 'github/develop' into collected-small-changes
# Conflicts: # src/DIPOLE/pair_lj_cut_dipole_long.h # src/OPENMP/fix_nvt_sllod_omp.h # src/PHONON/fix_phonon.h # src/SPIN/pair_spin_dipole_cut.h # src/SPIN/pair_spin_dipole_long.h # src/STUBS/mpi.h # src/UEF/fix_nh_uef.h # src/fix_nvt_sllod.h # tools/coding_standard/homepage.py
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
/* ----------------------------------------------------------------------
|
||||
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
||||
https://www.lammps.org/, Sandia National Laboratories
|
||||
Steve Plimpton, sjplimp@sandia.gov
|
||||
LAMMPS Development team: developers@lammps.org
|
||||
|
||||
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
||||
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
||||
|
||||
Reference in New Issue
Block a user