Merge branch 'develop' into hse-dev
Conflicts: src/ExchangeOperator.C src/ExchangeOperator.h src/KPGridConnectivity.C src/KPGridConnectivity.h src/Species.C src/XCPotential.h src/Xc.h src/notes util/cell.plt util/econst.plt util/econst_cmp.plt util/econste.plt util/econste_cmp.plt util/egap.sh util/etotal.plt util/etotal_cmp.plt util/etotal_int.plt util/etotal_int_cmp.plt util/force.plt util/kpgen/kpgen.C util/qbox_msd.py util/sigma.plt util/temp_ion.plt util/volume.plt
Showing
build/bgq-anl-omp.mk
0 → 100644
build/centos6.mk
0 → 100644
build/gcc_atlas.mk
0 → 100644
build/icc_mkl.mk
0 → 100644
build/icc_mkl_omp.mk
0 → 100644
src/AlphaPBE0.h
0 → 100644