?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 33f13b5 5ab3390)
Merge branch 'master' of git://git.code.sf.net/p/foam-extend/foam-extend-3.2 into...
commit203a2bb7e04904266c62f2b0069edff7fd09523c
authorHrvoje Jasak <h.jasak@wikki.co.uk>
Fri, 23 Sep 2016 09:11:44 +0000 (23 10:11 +0100)
committerHrvoje Jasak <h.jasak@wikki.co.uk>
Fri, 23 Sep 2016 09:11:44 +0000 (23 10:11 +0100)
treef79547705669c3e889f6ad1b39863d2d31d8dd0ftree | snapshot (tar.gz zip)
parent33f13b59c8b5002f10200d50522281eb772b91f3commit | diff
parent5ab3390aef43ef3be5669097a4f14bf538fa8b43commit | diff
Merge branch 'master' of git://git.code.sf.net/p/foam-extend/foam-extend-3.2 into feature/PstreamUpdate

Conflicts:
src/foam/db/IOstreams/Pstreams/Pstream.C
src/foam/db/IOstreams/Pstreams/Pstream.C diff1 |  diff2 |  blob | history
src/foam/db/IOstreams/Pstreams/Pstream.H diff1 |  diff2 |  blob | history
The foam-extend project is a fork of the OpenFOAM® open source library for Computational Fluid Dynamics (CFD). It is an open project welcoming and integrating contributions from all users and developers.