jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into requirejs_conflict

Browse source 
Conflicts:
	Makefile.dryice.js
This commit is contained in:
nightwing 2012-08-12 17:14:06 +04:00
commit 18b33c57bb
37 changed files with 384 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.dryice.js
View file

@ -153,10 +153,6 @@ function ace() {
source: ACE_HOME + "/LICENSE",
dest: BUILD_DIR + "/LICENSE"
});
copy({
source: ACE_HOME + "/Readme.md",
dest: BUILD_DIR + "/Readme.md"
});
copy({
source: ACE_HOME + "/ChangeLog.txt",
dest: BUILD_DIR + "/ChangeLog.txt"