Skip to content

Commit

Permalink
Merge pull request #63 from Jesus89/develop
Browse files Browse the repository at this point in the history
Sync list files. Closes #62
  • Loading branch information
Jesus89 committed Aug 11, 2016
2 parents 0a92f1a + f1835fd commit ff0dbed
Show file tree
Hide file tree
Showing 14 changed files with 383 additions and 332 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -12,12 +12,12 @@ Experimental graphic editor for open FPGAs: [iCEstick](http://www.pighixxx.com/t

* Version 0.3.0

* Requirements definition phase: [wiki](https://github.com/FPGAwars/icestudio/wiki/Icestudio-0.3:-proposed-features)
* Requirements definition phase: [wiki](https://github.com/FPGAwars/icestudio/wiki/Icestudio-0.3.0:-proposed-features)


* Version 0.2.X

* Add new blocks, examples and templates
* Add new blocks, examples and templates: [wiki](https://github.com/FPGAwars/icestudio/wiki/Icestudio-0.2.X:-proposed-content)

## Version 0.2 beta

Expand Down
1 change: 0 additions & 1 deletion app/package.json
Expand Up @@ -21,7 +21,6 @@
},
"dependencies": {
"alertifyjs": "^1.7.1",
"glob": "^7.0.5",
"jquery": "^2.2.3",
"os": "^0.1.1",
"path": "^0.12.7",
Expand Down
207 changes: 50 additions & 157 deletions app/resources/images/and.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
87 changes: 51 additions & 36 deletions app/resources/images/not.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ff0dbed

Please sign in to comment.