Merge branch 'HrvojeJasak' of ssh://git.code.sf.net/u/hjasak/foam-extend-3.1 into...
commitb54c874277cb22ba609b2147928d2486f8fbf0dc
authorHrvoje Jasak <h.jasak@wikki.co.uk>
Tue, 25 Aug 2015 14:53:07 +0000 (25 15:53 +0100)
committerHrvoje Jasak <h.jasak@wikki.co.uk>
Tue, 25 Aug 2015 14:53:07 +0000 (25 15:53 +0100)
treea389b22f9de47e474c8e819415ba589c2983b8d3
parente3cb2a78dcfbe6075edc22b25ce3e082c01efcb4
parent445b28d6a484c1b2b6f02a149c8f724155006e6b
Merge branch 'HrvojeJasak' of ssh://git.code.sf.net/u/hjasak/foam-extend-3.1 into HrvojeJasak

Conflicts:
src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C
src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C