fixed merge conflicts

diff --git a/building.php b/building.php
index 479a16359146a424e0c6b1ea6ca8f0dcb1b2c8e8..532661f1818baeb0c4e3584432da570b9f9231e6 100644 (file)
--- a/building.php
+++ b/building.php
@@ -181,7 +181,7 @@ install all the build dependencies for an already packaged project. For
 example, on Ubuntu/Debian systems, you can run this:
 
 <pre><b>
-  apt-get build-dep PACKAGE
+  sudo apt-get build-dep PACKAGE
 </b></pre>
 
 That is a very easy way to get the build dependencies installed. Be

diff --git a/lectures.php b/lectures.php
index 20e0b40b0d0c81b26e932bbe1ccd78bd3797ed7d..86fbd6153fcfed3954672c0ce1d4c609a9288474 100644 (file)
--- a/lectures.php
+++ b/lectures.php
@@ -140,7 +140,6 @@ platforms that they run on.</p>
 <li><a href="videos/MOV011.low.ogv">LQ video</a> (100M Ogg/Theora)</li>
 </ul>
 
-
 <h2>Lecture 13: Starting a new project</h2>
 
 <p>This lecture looks at what is involved in staring a new FOSS project.</p>
@@ -165,7 +164,7 @@ shaped the FOSS world.</p>
 <p>This lecture sums up the weeks material.</p>
 
 <ul>
-<li><a href="lectures/release_early_tales.pdf">release_early.pdf</a></li>
+<li><a href="lectures/release_early.pdf">release_early.pdf</a></li>
 <li><a href="videos/MOV01B.low.ogv">LQ video</a> (37M Ogg/Theora)</li>
 </ul>
 

diff --git a/lectures/foss_tales.odp b/lectures/foss_tales.odp
index 03dfcfae448e5b696c34cc6ca5761253040fc739..4449d557a34800503b7b5287d879b7fdfec773be 100644 (file)
Binary files a/lectures/foss_tales.odp and b/lectures/foss_tales.odp differ

diff --git a/lectures/foss_tales.pdf b/lectures/foss_tales.pdf
new file mode 100644 (file)
index 0000000..a4fc5d5
Binary files /dev/null and b/lectures/foss_tales.pdf differ

diff --git a/lectures/release_early.pdf b/lectures/release_early.pdf
new file mode 100644 (file)
index 0000000..0d1d0d2
Binary files /dev/null and b/lectures/release_early.pdf differ

diff --git a/lectures/starting_a_project.pdf b/lectures/starting_a_project.pdf
new file mode 100644 (file)
index 0000000..269162c
Binary files /dev/null and b/lectures/starting_a_project.pdf differ