Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_kernel_c / nb_kernel_template_c.pre

diff --git a/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
similarity index 100%
rename from src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
rename to src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre