git.tremily.us Git - reveal.js.git/commit

projects / reveal.js.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aefe981 379f5d3)

author	Michael Kühnel <mail@michael-kuehnel.de>
	Wed, 24 Oct 2012 15:48:50 +0000 (17:48 +0200)
committer	Michael Kühnel <mail@michael-kuehnel.de>
	Wed, 24 Oct 2012 15:48:50 +0000 (17:48 +0200)
commit	5af915adaf0f03ea936323e827e86fab6b0bb4e9
tree	0e72e9c726ed96105ccc3ef7364ee782bf412306	tree \| snapshot
parent	aefe981040ea8c5c7875d9da1ac860def44a19e8	commit \| diff
parent	379f5d38ff8c66c10c22a0a18227b481e945dc02	commit \| diff

Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

Conflicts:
js/reveal.min.js

Need to generate a new minified version afterwards.

README.md	diff1 \|	diff2 \|	blob \| history
js/reveal.js	diff1 \|	diff2 \|	blob \| history
plugin/notes-server/client.js	diff1 \|	diff2 \|	blob \| history
plugin/notes-server/index.js	diff1 \|	diff2 \|	blob \| history
plugin/notes-server/notes.html	diff1 \|	diff2 \|	blob \| history

Assorted talks written in reveal.js.