X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=MicrosoftTactics;h=f6454897c3685aebecf619b1bba32a1ceff9049c;hp=777978a4b8710fbc3ecc96bcd4260708e6a4ec26;hb=badfb2d7502efe90665e05411a2cd72c67a56c66;hpb=35aa91390b32c1663dd8b7825cc44e2a81b7585c

diff --git a/MicrosoftTactics b/MicrosoftTactics
index 777978a..f645489 100644
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -66,7 +66,6 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
 === Targeting open standards ===
 
-
  * Creating OOXML to disrupt the Open Document Format.
 
  * Bribe ISO into accepting OOXML (2008)
@@ -76,7 +75,16 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
  * Tactic for [[http://www.groklaw.net/articlebasic.php?story=20071023002351958|taking over standard panels]] by controlling the moderator (1997-2008).
 
 
-=== Targeting specific FLOSS projects ===
+=== Targeting Android ===
+
+ * [[http://www.groklaw.net/article.php?story=20110322014831856|Undercover Microsoft lawyer]] attacks Android for alleged GPL violations (2011)
+
+ * [[http://googleblog.blogspot.com/2011/08/when-patents-attack-android.html|Patent attack on Android]] from Microsoft, Apple and Oracle (2011)
+
+ * Campaign offering [[http://www.wpcentral.com/ben-rudolph-offering-5-unhappy-android-users-free-windows-phone|free Windows phones]] for badmouthing Android (2012)
+
+
+=== Targeting specific Free Software projects ===
 
  * Bribe Blender (2008)
 
@@ -106,8 +114,11 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * [[http://arstechnica.com/microsoft/news/2010/06/microsoft-slips-ie-firefox-add-on-into-toolbar-update.ars | Microsoft hides mystery Firefox extension in toolbar update]]
 
+ * [[http://www.youtube.com/watch?v=TDbrX5U75dk | Gmail Man campaign]], asking people to switch to Microsoft Office 365 (2012)
+
+ * [[http://www.youtube.com/watch?v=k4EbCkotKPU | Googlighting competitive campaign]] asking companies to stay with Microsoft Office (2012)
 
 == Help wanted! ==
 
-Please help expand and verify this list!
-Each claim should come with links to supporting material.
+Please help expand this list!
+Each new item should come with a link a reference to supporting evidence or press coverage.
\ No newline at end of file