Skip to content

Commit

Permalink
Merge branch 'master' into 177
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Mantilla committed Feb 4, 2014
2 parents bc2ee5a + 41c6568 commit 1b5699d
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 107 deletions.
249 changes: 142 additions & 107 deletions brain/brain.xml

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

0 comments on commit 1b5699d

Please sign in to comment.