# HG changeset patch # User Madhusudan.C.S # Date 1270203307 -19800 # Node ID 38adf73fd1236d2aece10cfd4ebddf95d380bd95 # Parent 26294a5b856b44103e411ed9f9300d50e00780d1# Parent 701585ab7eca1b9b7f15242c0078e3edb0d7d101 Merged Vattam and Puneeth branches. diff -r 26294a5b856b -r 38adf73fd123 day1/Makefile --- a/day1/Makefile Tue Mar 30 11:29:26 2010 +0530 +++ b/day1/Makefile Fri Apr 02 15:45:07 2010 +0530 @@ -4,7 +4,8 @@ pdflatex $*.tex pdflatex $*.tex -SLIDES= session1.pdf \ +SLIDES= tot.pdf \ + session1.pdf \ session2.pdf \ session3.pdf \ session4.pdf \ @@ -24,7 +25,7 @@ cheats: $(CHEATS) -slides: $(SLIDES) $(CHEATS) +slides: $(SLIDES) quiz: $(QUIZ) diff -r 26294a5b856b -r 38adf73fd123 day2/Makefile --- a/day2/Makefile Tue Mar 30 11:29:26 2010 +0530 +++ b/day2/Makefile Fri Apr 02 15:45:07 2010 +0530 @@ -22,7 +22,7 @@ cheats: $(CHEATS) -slides: $(SLIDES) $(CHEATS) +slides: $(SLIDES) quiz: $(QUIZ)