Permalink
Browse files

Merge branch 'master' of github.com:marcotmarcot/scoped-instances-dis…

…sertation

Conflicts:
	.gitignore
  • Loading branch information...
2 parents e70c2c5 + 462a8cb commit 1680dbdfef216ef6511fccccaf20e5a0c3844c55 @marcotmarcot committed Nov 14, 2012
Showing with 32 additions and 4 deletions.
  1. +28 −4 .gitignore
  2. +4 −0 README.md
View
@@ -1,13 +1,37 @@
*~
+*.bst
+*.cls
+*.dtx
+*.ins
+*.acn
+*.acr
+*.alg
*.aux
*.bbl
*.blg
+*.dvi
+*.fdb_latexmk
+*.glg
+*.glo
+*.gls
+*.idx
+*.ilg
+*.ind
+*.ist
*.lof
*.log
*.lot
+*.maf
+*.mtc
+*.mtc0
+*.nav
+*.nlo
*.out
+*.pdfsync
+*.ps
+*.snm
+*.synctex.gz
*.toc
-*.bst
-*.cls
-*.dtx
-*.ins
+*.vrb
+*.xdy
+*.tdo
View
@@ -0,0 +1,4 @@
+scoped-instances-dissertation
+=============================
+
+Marco's Masters Dissertation

0 comments on commit 1680dbd

Please sign in to comment.