Merge remote-tracking branch 'origin/feature/overlapGgi' into nextRelease
commit090c07f3a76579058e25bda4aa2cf56a040914be
authorDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 12:42:18 +0000 (8 13:42 +0100)
committerDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 12:42:18 +0000 (8 13:42 +0100)
tree0dd6586c90a5393e3573520240430f8590604e3e
parent09d858c1062c4f745f3bafd724229da89841633c
parent80d1a8392b5d6e642ff4b0a844e83764786813a1
Merge remote-tracking branch 'origin/feature/overlapGgi' into nextRelease

Conflicts:
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H
.gitignore
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H