From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 29 Jun 2010 17:27:34 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dpavlin/HTML5TV
X-Git-Url: http://git.rot13.org/?p=HTML5TV.git;a=commitdiff_plain;h=e30c79359f33c5f23be59012e3b3f5c5acaa91ca;hp=f060a1ff587524ef35663204dd59c9a25971a306

Merge branch 'master' of github.com:dpavlin/HTML5TV
---

diff --git a/media/fosdem2008-udev-dbus-hal/presentation.pdf b/media/fosdem2008-udev-dbus-hal/presentation.pdf
new file mode 120000
index 0000000..66af27d
--- /dev/null
+++ b/media/fosdem2008-udev-dbus-hal/presentation.pdf
@@ -0,0 +1 @@
+Suspects.pdf
\ No newline at end of file
diff --git a/media/fosdem2008-udev-dbus-hal/video.srt.yaml b/media/fosdem2008-udev-dbus-hal/video.srt.yaml
new file mode 100644
index 0000000..52c4dd6
--- /dev/null
+++ b/media/fosdem2008-udev-dbus-hal/video.srt.yaml
@@ -0,0 +1,76 @@
+--- 
+- 1.4
+- 2.4
+- "[1] Overview"
+--- 
+- 19.1
+- 20.1
+- "[2] Overview"
+--- 
+- 55.7
+- 56.7
+- "[3] Overview Rationale: It\xE2\x80\x99s All About Events"
+--- 
+- 58.3
+- 59.3
+- "[4] Overview Rationale: It\xE2\x80\x99s All About Events"
+--- 
+- 86.1
+- 87.1
+- "[5] Overview Rationale: It\xE2\x80\x99s All About Events"
+--- 
+- 148.0
+- 149
+- "[6] Overview Event Flow"
+--- 
+- 149.7
+- 150.7
+- "[7] Overview Event Flow"
+--- 
+- 195.0
+- 196
+- "[8] Overview Event Flow"
+--- 
+- 297.2
+- 298.2
+- "[9] Overview Investigating a Use-Case"
+--- 
+- 319.1
+- 320.1
+- "[10] Overview Investigating a Use-Case"
+--- 
+- 379.3
+- 380.3
+- "[11] Overview Investigating a Use-Case"
+--- 
+- 408.5
+- 409.5
+- "[12] Overview Solving the Issue"
+--- 
+- 412.0
+- 413
+- "[13] Overview Solving the Issue"
+--- 
+- 448.3
+- 449.3
+- "[14] Overview The Event Monitor"
+--- 
+- 481.0
+- 482
+- "[15] Overview The Event Monitor"
+--- 
+- 517.7
+- 518.7
+- "[16] Overview The Event Monitor"
+--- 
+- 553.5
+- 554.5
+- "[17] Overview The Event Monitor"
+--- 
+- 582.4
+- 583.4
+- "[18] Overview"
+--- 
+- 915.6
+- 916.6
+- "[19] Overview"
diff --git a/media/fosdem2008-udev-dbus-hal/www.sh b/media/fosdem2008-udev-dbus-hal/www.sh
new file mode 100644
index 0000000..d415131
--- /dev/null
+++ b/media/fosdem2008-udev-dbus-hal/www.sh
@@ -0,0 +1 @@
+wget -nc http://en.opensuse.org/images/e/ee/Suspects.pdf