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

Merge remote branch 'jviereck/kb'

Browse source 
Conflicts:
	lib/ace/keyboard/keybinding/default_mac.js
	lib/ace/keyboard/keybinding/default_win.js
	support/pilot
This commit is contained in:
Fabian Jakobs 2011-03-07 20:00:51 +01:00
commit 0a00b8aea6
7 changed files with 149 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

2
support/cockpit

@ -1 +1 @@
Subproject commit 1fa3516d4d553af9f6edd81c20023bcfab08c2a3
Subproject commit 7362e0331327321f4d743ad70a8ded16327443f2

2
support/pilot

@ -1 +1 @@
Subproject commit 1b6251c4bc1d24406d041c2949c3d3f99a112425
Subproject commit 12fc67b15ce0dbebd9de7da1d948b7f65251bb94