Skip to content

Commit

Permalink
Merge branch 'release/v1.0' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis Chapligin committed Oct 10, 2013
2 parents 0908f21 + e8aefd6 commit 1bd772e
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 2,056 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea
*.iml
atlassian-ide-plugin.xml
r.js
compiler.jar
6 changes: 6 additions & 0 deletions build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
({
baseUrl: "./js/",
name: "app",
out: "app-built.js",
optimize: "none"
})
Loading

0 comments on commit 1bd772e

Please sign in to comment.