Merge remote-tracking branch 'upstream/master'
This commit is contained in:
		@@ -11,7 +11,7 @@ module.exports = function(grunt) {
 | 
				
			|||||||
				' * http://lab.hakim.se/reveal-js\n' +
 | 
									' * http://lab.hakim.se/reveal-js\n' +
 | 
				
			||||||
				' * MIT licensed\n' +
 | 
									' * MIT licensed\n' +
 | 
				
			||||||
				' *\n' +
 | 
									' *\n' +
 | 
				
			||||||
				' * Copyright (C) 2013 Hakim El Hattab, http://hakim.se\n' +
 | 
									' * Copyright (C) 2014 Hakim El Hattab, http://hakim.se\n' +
 | 
				
			||||||
				' */'
 | 
									' */'
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
Copyright (C) 2013 Hakim El Hattab, http://hakim.se
 | 
					Copyright (C) 2014 Hakim El Hattab, http://hakim.se
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
					Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
				
			||||||
of this software and associated documentation files (the "Software"), to deal
 | 
					of this software and associated documentation files (the "Software"), to deal
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -930,4 +930,4 @@ If you have personal support questions use [StackOverflow](http://stackoverflow.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
MIT licensed
 | 
					MIT licensed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Copyright (C) 2013 Hakim El Hattab, http://hakim.se
 | 
					Copyright (C) 2014 Hakim El Hattab, http://hakim.se
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@
 | 
				
			|||||||
 * http://lab.hakim.se/reveal-js
 | 
					 * http://lab.hakim.se/reveal-js
 | 
				
			||||||
 * MIT licensed
 | 
					 * MIT licensed
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Copyright (C) 2013 Hakim El Hattab, http://hakim.se
 | 
					 * Copyright (C) 2014 Hakim El Hattab, http://hakim.se
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								css/reveal.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								css/reveal.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										10
									
								
								index.html
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								index.html
									
									
									
									
									
								
							@@ -20,9 +20,15 @@
 | 
				
			|||||||
		<!-- For syntax highlighting -->
 | 
							<!-- For syntax highlighting -->
 | 
				
			||||||
		<link rel="stylesheet" href="lib/css/zenburn.css">
 | 
							<link rel="stylesheet" href="lib/css/zenburn.css">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<!-- If the query includes 'print-pdf', use the PDF print sheet -->
 | 
							<!-- If the query includes 'print-pdf', include the PDF print sheet -->
 | 
				
			||||||
		<script>
 | 
							<script>
 | 
				
			||||||
			document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
 | 
								if( window.location.search.match( /print-pdf/gi ) ) {
 | 
				
			||||||
 | 
									var link = document.createElement( 'link' );
 | 
				
			||||||
 | 
									link.rel = 'stylesheet';
 | 
				
			||||||
 | 
									link.type = 'text/css';
 | 
				
			||||||
 | 
									link.href = 'css/print/pdf.css';
 | 
				
			||||||
 | 
									document.getElementsByTagName( 'head' )[0].appendChild( link );
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		</script>
 | 
							</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<!--[if lt IE 9]>
 | 
							<!--[if lt IE 9]>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@
 | 
				
			|||||||
 * http://lab.hakim.se/reveal-js
 | 
					 * http://lab.hakim.se/reveal-js
 | 
				
			||||||
 * MIT licensed
 | 
					 * MIT licensed
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Copyright (C) 2013 Hakim El Hattab, http://hakim.se
 | 
					 * Copyright (C) 2014 Hakim El Hattab, http://hakim.se
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
var Reveal = (function(){
 | 
					var Reveal = (function(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								js/reveal.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								js/reveal.min.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "reveal.js",
 | 
					  "name": "reveal.js",
 | 
				
			||||||
  "version": "2.6.1",
 | 
					  "version": "2.6.2",
 | 
				
			||||||
  "description": "The HTML Presentation Framework",
 | 
					  "description": "The HTML Presentation Framework",
 | 
				
			||||||
  "homepage": "http://lab.hakim.se/reveal-js",
 | 
					  "homepage": "http://lab.hakim.se/reveal-js",
 | 
				
			||||||
  "subdomain": "revealjs",
 | 
					  "subdomain": "revealjs",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user