6099142 Added missing Revision macro file from chamcham branch.
d0a81a4 Merge commit 'b4d20b7c'
79d7a4c Fixed revision issue.
985e8b5 Cmake changes from chamcham branch. Build for launchpad.

git-subtree-dir: moose-core
git-subtree-split: 6099142d63632177056c3077d6d84035388cb93f

Conflicts:
	moose-core/CMakeLists.txt

4f391e1 --std=c++11 is must now. Fixes BhallaLab/moose#214.
718252a Do not copy VERSION file for python. Lets find a better and more portable solution.
f26225d Updated default version in setup.py file.
1476ea1 Merge commit '0ff1b77a'
0da1cc4 VERSION string is fixed to today's date if not given.

git-subtree-dir: moose-core
git-subtree-split: 4f391e1ef906eacb103bb85d723ee98453f06d5b

Conflicts:
	moose-core/CMakeLists.txt

portable solution.

d282884 specific math functions are imported
16439cc checked for Qt_Version and icon takes config.settings
cecb74c resize qObject if change in text size

git-subtree-dir: moose-gui
git-subtree-split: d282884250997aa6cc1154b6ba93fee6c3ccc630

8c7c00c can pass command line arguments also
70f83d0 cleanup in return type from None to moose.shell
fe4238b indentation for python3
3e81764 indentation fixes for python3
66f1bb0 Removed <<<<, ===  and >>> from improper merge.
0719a5d Merge commit '349abe7e'
864776c added deleted files
87a6963 temp deleted

git-subtree-dir: moose-examples
git-subtree-split: 8c7c00c0e29c3c02c1e20f82f8baba5206ea913d

eb878dd Merge branch 'master' of https://github.com/BhallaLab/moose-core
68ef2ed Less verbose ReadSwc and rdesigneur. Fix to SeqSynHandler
2c93c52 return type from None to moose.shell
07fc0f9 Ignore /opt/bin/python3 on travis. Numpy is not available for this path. Try /usr/bin/python3.
45fb960 mtseed and mtrand are under moose namespace and defined in global.h file. Fixes for travis failure with BOOST.
dfa0ab1 Explicitly naming the source file in synapse directory.
cd32764 old makefile based flow is deprecated. Recent commit fixed the test faillure.
c0f5469 Merge branch 'master' of https://github.com/BhallaLab/moose-core
fd96222 Verbose flag for rdesigneur; added synapseOrder to SeqSynHandler, fixes to testSynapse
e7d57cf plot_tables can plot on user given axis.
43faa23 mu.plot_records is renamed to mu.plot_tables.
99f5ee7 Merge branch 'master' of github.com:BhallaLab/moose-core
953142d Fixed for snappy builds.
6931e80 Let cmake find path of Python.h fi...

270c880 Search numpy path in cmake are fixed for snapcraft.

git-subtree-dir: moose-core
git-subtree-split: 270c880c3a3005c3ed1000a87069a0f6bb1bdb0f

7054325 mooseaddChemSolver is needed in loadSbmlModel file
6116c7e Indentation cleanup
9fd501a conflict cleanups
fe297f6 indentation correction
2b24c64 indentation correction
0e329d5 Merge branch 'master' of http://github.com/BhallaLab/moose-examples
7ce262e corrected indentation
0f1e722 Resolved merge conflict
0ff3b05 temp deletion

git-subtree-dir: moose-examples
git-subtree-split: 705432541ca38b6bd082bec1b1fc3e7809b4b32a

69062d9 For crossComptSimpleReac a temp fix so that segfault doesn't occur, rest cleanup
729f216 deleted unwanted files and added new files
045aa11 Fixed assert by Upi
2b16c59 Deleted temp files.
3881f8a khali khali
97599aa Fixed docstring on example.

git-subtree-dir: moose-examples
git-subtree-split: 69062d9340a032a32f316eed69f914e486c19171

7318878 cleanups
9b83291 Merge branch 'master' of github.com:BhallaLab/moose-examples
2f46ad0 Convert u'ABCD' to 'ABCD' to probably fix the python3 issue on travis. Works fine with python3 on ubuntu 16.04/Debian8.
6232b3a Send email to malav if build fails.
4a92db2 Merge branch 'master' of github.com:BhallaLab/moose-examples
4800cd6 Adding python-libsbml to dependencies.
c045972 Fixed second script as well.
e927a88 Merge branch 'master' of github.com:BhallaLab/moose-examples
626afb8 Added a hack to make this script work with both python3 and python2.
24fdc9e Indentation for python3
e9e5d92  Using force-yes with -y
3c60a82 Upi fix the assert error
ca2d409 Upi cleaned up the file
a9ddced Merge branch 'master' of https://github.com/BhallaLab/moose-examples
b4715d0 First commit.
2c4fa33 This is removed b'cos Rdesignuer does the job
4ca1f6d missing closing braces
d120484 small correction for input eval with is str
18990fd enter key replaced to zero, as function \'input\' with \'enter\' key give SyntaxError: unexpected EOF while parsing
0db144c Ready for put into demo #15.
39aa6e4 Closed docstring.
f2dc6be Merge commit '07ef36e1'

git-subtree-dir: moose-examples
git-subtree-split: 731887849ac227fa304780406ff913c69af425ca

669b981 VERSION conflict file is added
29362b6 Merge commit '628138cb'

git-subtree-dir: moose-core
git-subtree-split: 669b981fd06bf9b0919dca08cf87505c2f411802