Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tnowotny
tnowotny committed Dec 22, 2014
2 parents 73621f4 + b1124f8 commit 904062e
Showing 0 changed files with 0 additions and 0 deletions.

1 comment on commit 904062e

@tnowotny
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a hard merge of the development onto the master branch. The Michael_Schmuker_model example has been removed for the moment and placed in a separate branch (legacy-master) until it can be put up to speed with the new version of GeNN.

Please sign in to comment.