Merge branch 'master' into 1.x

This commit is contained in:
Sebastien Ros
2013-08-05 16:07:14 -07:00
8 changed files with 217 additions and 75 deletions

View File

@@ -51,6 +51,12 @@ Website: http://codemirror.net/2/
Copyright: Copyright (C) 2011 by Marijn Haverbeke
License: MIT
Console Shim
-----
Website: https://github.com/kayahr/console-shim
Copyright: Copyright (C) 2011 Klaus Reimer <k@ailis.de>
License: MIT
DLR
---
Website: http://dlr.codeplex.com