projects / web / gag.com / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: d1da382)
Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
authorBdale Garbee <bdale@gag.com>
Sat, 14 Jul 2012 17:34:15 +0000 (11:34 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 14 Jul 2012 17:34:15 +0000 (11:34 -0600)
bdale/talks/2011/debconf/AltosUI.odp [new file with mode: 0644] patch | blob
bdale/talks/2011/debconf/FreedomBox.odp [new file with mode: 0644] patch | blob
bdale/talks/2011/debconf/SPI.odp [new file with mode: 0644] patch | blob
bdale/talks/2012/cyberpoint/TechTalk.odp [new file with mode: 0644] patch | blob
bdale/talks/2012/debconf/FreedomBox.odp [new file with mode: 0644] patch | blob
bdale/talks/2012/debconf/MeetTech.odp [new file with mode: 0644] patch | blob
bdale/talks/2012/debconf/SPI.odp [new file with mode: 0644] patch | blob
bdale/talks/2012/debconf/UnderstandingDebian.odp patch | blob | history
bdale/talks/2012/linuxcon-japan/FreedomBox.odp [new file with mode: 0644] patch | blob

diff --git a/bdale/talks/2011/debconf/AltosUI.odp b/bdale/talks/2011/debconf/AltosUI.odp
new file mode 100644 (file)
index 0000000..51b1697
Binary files /dev/null and b/bdale/talks/2011/debconf/AltosUI.odp differ
diff --git a/bdale/talks/2011/debconf/FreedomBox.odp b/bdale/talks/2011/debconf/FreedomBox.odp
new file mode 100644 (file)
index 0000000..6007d03
Binary files /dev/null and b/bdale/talks/2011/debconf/FreedomBox.odp differ
diff --git a/bdale/talks/2011/debconf/SPI.odp b/bdale/talks/2011/debconf/SPI.odp
new file mode 100644 (file)
index 0000000..7d3b448
Binary files /dev/null and b/bdale/talks/2011/debconf/SPI.odp differ
diff --git a/bdale/talks/2012/cyberpoint/TechTalk.odp b/bdale/talks/2012/cyberpoint/TechTalk.odp
new file mode 100644 (file)
index 0000000..c3a03c8
Binary files /dev/null and b/bdale/talks/2012/cyberpoint/TechTalk.odp differ
diff --git a/bdale/talks/2012/debconf/FreedomBox.odp b/bdale/talks/2012/debconf/FreedomBox.odp
new file mode 100644 (file)
index 0000000..cf0ee29
Binary files /dev/null and b/bdale/talks/2012/debconf/FreedomBox.odp differ
diff --git a/bdale/talks/2012/debconf/MeetTech.odp b/bdale/talks/2012/debconf/MeetTech.odp
new file mode 100644 (file)
index 0000000..a97d0bd
Binary files /dev/null and b/bdale/talks/2012/debconf/MeetTech.odp differ
diff --git a/bdale/talks/2012/debconf/SPI.odp b/bdale/talks/2012/debconf/SPI.odp
new file mode 100644 (file)
index 0000000..9f95b0c
Binary files /dev/null and b/bdale/talks/2012/debconf/SPI.odp differ
diff --git a/bdale/talks/2012/debconf/UnderstandingDebian.odp b/bdale/talks/2012/debconf/UnderstandingDebian.odp
index b53d3fd2b03c7b20ae28cde3ef2a07664b7d42d2..114bfa368225110b0862dae48a66e4491a5c304a 100644 (file)
Binary files a/bdale/talks/2012/debconf/UnderstandingDebian.odp and b/bdale/talks/2012/debconf/UnderstandingDebian.odp differ
diff --git a/bdale/talks/2012/linuxcon-japan/FreedomBox.odp b/bdale/talks/2012/linuxcon-japan/FreedomBox.odp
new file mode 100644 (file)
index 0000000..94bdfe8
Binary files /dev/null and b/bdale/talks/2012/linuxcon-japan/FreedomBox.odp differ
Garbee and Garbee web site