Skip to content

Commit

Permalink
Merge pull request #25 from ww24/develop
Browse files Browse the repository at this point in the history
Update Ace [v1.1.8]
  • Loading branch information
ww24 committed Nov 30, 2014
2 parents 1a429a3 + ed4ef73 commit 6b5232a
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ace"]
path = ace
url = https://github.com/ajaxorg/ace.git
[submodule "ace/build"]
path = ace/build
url = https://github.com/ajaxorg/ace-builds.git
1 change: 0 additions & 1 deletion ace
Submodule ace deleted from 6c235f
1 change: 1 addition & 0 deletions ace/build
Submodule build added at 7fafd1
14 changes: 12 additions & 2 deletions build/deps/ace.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/deps/mace-core.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*!
* Mace 0.1.1
* Mace 0.1.2
* copyright: Takenori Nakagawa
* license: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion build/deps/mace-core.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions build/mace.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mace",
"version": "0.1.1",
"version": "0.1.2",
"description": "Mace = Markdown editor powered by Ace.",
"main": "gulpfile.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/mace.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###!
# Mace 0.1.1
# Mace 0.1.2
# copyright: Takenori Nakagawa
# license: MIT
###
Expand Down

0 comments on commit 6b5232a

Please sign in to comment.