Merge branch 'develop' into hex_lattice

Conflicts:
	src/initialize.F90
This commit is contained in:
Sterling Harper 2014-09-06 00:40:19 -04:00
commit fdba574a77
140 changed files with 158819 additions and 160135 deletions

View file

@ -43,7 +43,7 @@ following commands in a terminal:
git clone git://github.com/mit-crpg/openmc.git
cd openmc/src
git checkout master
git checkout -b master origin/master
make
sudo make install