aaron/c0db
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'shyam_raghavan' of github.com:aarongut/cdb into shyam_raghavan

Browse Source 
Conflicts:
	progress_report/progress_report.dvi
	progress_report/progress_report.fdb_latexmk
	progress_report/progress_report.fls
	progress_report/progress_report.out
	progress_report/progress_report.pdf
	progress_report/progress_report.tex
	progress_report/progress_report.tex.project.vim
	progress_report/progress_report_aux
This commit is contained in:
Shyam Raghavan
2015-04-20 20:36:50 -04:00
parent d0540da465 ff581d8a8c
commit 62d0e37984
6 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
progress_report/progress_report.fls
View File

@@ -124,5 +124,10 @@ INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm
INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txsy.tfm
<<<<<<< HEAD
INPUT old-gantt.png
INPUT old-gantt.png
=======
INPUT old-gantt.jpg
INPUT old-gantt.jpg
>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9