Merge remote-tracking branch 'jpallen/latex_highlighting' into gh-pages

Conflicts:
	demo/demo.js
	kitchen-sink.html
This commit is contained in:
Fabian Jakobs 2011-09-06 14:31:23 +02:00
commit aaa7abe505
4 changed files with 108 additions and 2 deletions

View file

@ -38,6 +38,7 @@
<option value="textile">Textile</option>
<option value="groovy">Groovy</option>
<option value="scala">Scala</option>
<option value="latex">LaTeX</option>
</select>
</td>
</tr>
@ -69,6 +70,7 @@
<option value="textile">Textile</option>
<option value="groovy">Groovy</option>
<option value="scala">Scala</option>
<option value="latex">LaTeX</option>
</select>
</td>
</tr>