Edit page MicrosoftTactics

diff --git a/MicrosoftTactics b/MicrosoftTactics
index 777978a4b8710fbc3ecc96bcd4260708e6a4ec26..7ea7ce60af3988e88feac1b90b1cdfc971f1f891 100644 (file)
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -66,7 +66,6 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
 === Targeting open standards ===
 
 
 === Targeting open standards ===
 

-

  * Creating OOXML to disrupt the Open Document Format.
 
  * Bribe ISO into accepting OOXML (2008)
  * Creating OOXML to disrupt the Open Document Format.
 
  * Bribe ISO into accepting OOXML (2008)


@@ -88,6 +87,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * [[http://arstechnica.com/microsoft/news/2010/10/microsoft-posts-video-of-customers-criticizing-openoffice.ars|Video against OpenOffice]] and OpenSource in general (2010)
 
 
  * [[http://arstechnica.com/microsoft/news/2010/10/microsoft-posts-video-of-customers-criticizing-openoffice.ars|Video against OpenOffice]] and OpenSource in general (2010)
 

+ * [[http://www.groklaw.net/article.php?story=20110322014831856|Undercover Microsoft lawyer]] attacks Android for alleged GPL violations

 
 === Targeting Free Software licenses and development model ===
 
 
 === Targeting Free Software licenses and development model ===