From 77d497a7cfc6b15810dcecde843f37767241fd0b Mon Sep 17 00:00:00 2001 From: Dilawar Singh <dilawars@ncbs.res.in> Date: Tue, 1 Sep 2015 12:32:17 +0530 Subject: [PATCH] Merged changes, fixed the build, updated readme. --- README.md | 8 ++++---- moose-core | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 639465c4..089af9a5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -Build Status - master (This is stable branch): [](https://travis-ci.org/BhallaLab/moose) +[](https://travis-ci.org/BhallaLab/moose) -This is the meta repository of MOOSE simulator. It contains C++ core of MOOSE, -python scripting interface and its GUI. +This is meta repository of MOOSE simulator. It contains C++ core of MOOSE, +python scripting interface, its GUI repositories as submodule. -For more details about these projects, read respective README files. +For more details about these sub-projects, read respective README files. # Installation using cmake diff --git a/moose-core b/moose-core index fa1de12d..0431e809 160000 --- a/moose-core +++ b/moose-core @@ -1 +1 @@ -Subproject commit fa1de12d87012e02af3c4bc338d49617efd129b0 +Subproject commit 0431e8094531d77a96cd41dcda513aa4058b306e -- GitLab