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

3
progress_report/progress_report.out
View File

@@ -2,6 +2,7 @@
\BOOKMARK [2][-]{subsection.1.1}{Purpose of the Report}{section.1}% 2
\BOOKMARK [2][-]{subsection.1.2}{Purpose of the Project}{section.1}% 3
\BOOKMARK [1][-]{section.2}{Literature Review}{}% 4
<<<<<<< HEAD
\BOOKMARK [1][-]{section.3}{Progress}{}% 5
\BOOKMARK [2][-]{subsection.3.1}{Front End: Status}{section.3}% 6
\BOOKMARK [2][-]{subsection.3.2}{Front End: Projections}{section.3}% 7
@@ -14,3 +15,5 @@
\BOOKMARK [2][-]{subsection.4.3}{Future Phases}{section.4}% 14
\BOOKMARK [2][-]{subsection.4.4}{Redefined Goals}{section.4}% 15
\BOOKMARK [1][-]{section.5}{Discussion}{}% 16
=======
>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9