"included all rights to water, oil, gas, and other minerals" . . . .