Merge gromacs-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_kernel_bluegene / nb_kernel_w3w3_bluegene.h

diff --git a/src/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_w3w3_bluegene.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_w3w3_bluegene.h
similarity index 100%
rename from src/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_w3w3_bluegene.h
rename to src/gromacs/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_w3w3_bluegene.h