treadme update for merge - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
 (HTM) git clone git://src.adamsgaard.dk/sphere
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit da6100d95d6270a3a60d50ec1d37e61299b333a9
 (DIR) parent bc41fb46fe0b5458ac8c6573cc573f5000076528
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Tue, 25 Mar 2014 14:22:24 +0100
       
       readme update for merge
       
       Diffstat:
         M README.rst                          |      10 +++-------
       
       1 file changed, 3 insertions(+), 7 deletions(-)
       ---
 (DIR) diff --git a/README.rst b/README.rst
       t@@ -8,13 +8,6 @@ License
        ``sphere`` is licensed under the GNU General Public License, v.3.
        See `LICENSE.txt <LICENSE.txt>`_ for more information.
        
       -About this branch
       ------------------
       -The git branch ``ns-cfd`` is a work in progress on implementing a Newtonian
       -fluid, fully coupled to the particle dynamics, by the Navier Stokes formulation
       -of computational fluid dynamics. The merge into the main branch is planned to
       -mark the 1.0 release of ``sphere``.
       -
        Important release notes
        -----------------------
        2013-03-13: Sphere has been updated to work with CUDA 5.0 or newer *only*.
       t@@ -32,6 +25,9 @@ general documentation.
        2014-03-09: The ``writebin`` member function of the ``sim`` class is now
        implicitly called when calling the ``run`` member function.
        
       +2014-03-25: Fluid phase in ``master`` branch simulated by the full Navier-Stokes
       +equations.
       +
        Documentation
        -------------
        See the separate documentation for general reference and installation