Merge branch 'master' of ssh://charles/tank/andrew/school/notes

diff --git a/physics/final.fls b/physics/final.fls
index 8d8874f3a553820d940b09f793c6aa943ef46ef6..ef09677eec9852489345ed0c8e235c3485c16e52 100644 (file)
--- a/physics/final.fls
+++ b/physics/final.fls
@@ -107,6 +107,12 @@ INPUT /var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map
 INPUT graphics/field-lines.png
 INPUT ./graphics/field-lines.png
 INPUT ./graphics/field-lines.png
+INPUT graphics/slap-2.jpeg
+INPUT ./graphics/slap-2.jpeg
+INPUT ./graphics/slap-2.jpeg
+INPUT graphics/grip.png
+INPUT ./graphics/grip.png
+INPUT ./graphics/grip.png
 INPUT graphics/ac-generator.png
 INPUT ./graphics/ac-generator.png
 INPUT ./graphics/ac-generator.png
@@ -125,9 +131,16 @@ INPUT ./graphics/transverse-waves.png
 INPUT graphics/polarisation.png
 INPUT ./graphics/polarisation.png
 INPUT ./graphics/polarisation.png
+INPUT graphics/diffraction.jpg
+INPUT ./graphics/diffraction.jpg
+INPUT ./graphics/diffraction.jpg
+INPUT graphics/diffraction-2.png
+INPUT ./graphics/diffraction-2.png
+INPUT ./graphics/diffraction-2.png
 INPUT graphics/refraction.png
 INPUT ./graphics/refraction.png
 INPUT ./graphics/refraction.png
+INPUT /usr/share/texmf-dist/fonts/tfm/public/cm/cmti10.tfm
 INPUT final.aux
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb
@@ -140,5 +153,6 @@ INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmr5.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmr7.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy7.pfb
+INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmti10.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/symbols/msam10.pfb
 INPUT /usr/share/texmf-dist/fonts/type1/public/amsfonts/symbols/msbm10.pfb