Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_free_energy.c

diff --git a/src/gmxlib/nonbonded/nb_free_energy.c b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
similarity index 100%
rename from src/gmxlib/nonbonded/nb_free_energy.c
rename to src/gromacs/gmxlib/nonbonded/nb_free_energy.c