larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							94f40ea318
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:larstvei/dot-emacs
						
						
						
						
						
						
						
						Conflicts:
	README.org 
						
					 | 
					
						2013-12-23 03:40:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							02f5a8b528
							
						
					 | 
					
						
						
							
							Renamed README.md to README.org to fix formatting.
						
						
						
						
						
					 | 
					
						2013-12-23 03:36:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff2ebaa518
							
						
					 | 
					
						
						
							
							Renamed README.md to README.org to fix formatting.
						
						
						
						
						
					 | 
					
						2013-12-23 03:36:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff8e4510e2
							
						
					 | 
					
						
						
							
							Add a symlink: README.md -> init.org
						
						
						
						
						
					 | 
					
						2013-12-23 03:32:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							36a399bcb8
							
						
					 | 
					
						
						
							
							Cleaned up the LaTeX section.
						
						
						
						
						
					 | 
					
						2013-12-23 03:26:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							39e2eec692
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:larstvei/dot-emacs
						
						
						
						
						
					 | 
					
						2013-12-23 03:01:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							930efb9fb4
							
						
					 | 
					
						
						
							
							Rewrote my Emacs configurations as a org-file.
						
						
						
						
						
					 | 
					
						2013-12-23 02:54:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b9cccd6d7
							
						
					 | 
					
						
						
							
							Rewrote my Emacs configurations as a org-file.
						
						
						
						
						
					 | 
					
						2013-12-23 02:52:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								larstvei
							
						 
					 | 
					
						
						
						
						
							
						
						
							6092b9a537
							
						
					 | 
					
						
						
							
							first commit
						
						
						
						
						
					 | 
					
						2013-01-25 01:09:07 +01:00 | 
					
					
						
						
							
							
							
						
					 |