From 9467819190fdd3d28ec534fcfe1895630f4c4c4a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 25 Oct 2011 13:01:46 +0530 Subject: Regenerate talk. --- blends/talk/swecha/index.html | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'blends') diff --git a/blends/talk/swecha/index.html b/blends/talk/swecha/index.html index 755e6af..65b5546 100644 --- a/blends/talk/swecha/index.html +++ b/blends/talk/swecha/index.html @@ -29,32 +29,40 @@ Jonas Smedegaard
  • Customizing Debian
  • Power & World Peace
  • - -
    -

    Free Software

    -

    Free is costly and challenging

    FLOSS

    +

    FLOSS == Free/Libre Open Source Software

    +
    +
    +

    FLOSS - Free Software

    +

    Free/Libre: Freedom Fighters wanting to share

    +
    +
    +

    FLOSS - Open Source

    +

    Open Source: Business folks wanting to trade

    + -

    Like "peace": we all want it, but at different cost

    -

    FLOSS is World Peace

    -

    Floss: Peaceful cooperation between liberators and liberals

    +

    FLOSS

    +

    FLOSS == Free/Libre Open Source Software

    +

    Floss: Friendly cooperation between liberators and liberals

    +
    +
    +

    FLOSS - more twists of words

    +

    FLOSS parts

    -- cgit v1.2.3