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

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

Browse source 
Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/mode/coffee_highlight_rules_test.js
This commit is contained in:
nightwing 2012-10-03 22:43:37 +04:00
commit 3d6ce5fdf5
89 changed files with 3929 additions and 12705 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kitchen-sink.html
View file

@ -13,10 +13,12 @@
<!--DEVEL-->
<link rel="stylesheet" href="demo/kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
<script src="http://use.edgefonts.net/source-code-pro.js"></script>
<!--DEVEL-->
<!--PACKAGE
<link rel="stylesheet" href="kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
<script src="http://use.edgefonts.net/source-code-pro.js"></script>
PACKAGE-->
</head>
<body>