From: Karl Palsson <karlp@tweak.net.au>
Date: Tue, 15 Nov 2011 01:42:47 +0000 (+0000)
Subject: Remove the "merge in progress" notice
X-Git-Url: https://git.gag.com/?p=fw%2Fstlink;a=commitdiff_plain;h=3355fb6a080447dec33c8868ecae1d22bf392fe7

Remove the "merge in progress" notice
---

diff --git a/README b/README
index 1eb6d26..838484e 100644
--- a/README
+++ b/README
@@ -1,11 +1,3 @@
-IMPORTANT SHORT TERM NOTICE:
-If you are targetting F1 devices, with either stlinkv1 or v2 hardware, you
-_need_ to use karlp's libwork2 branch.  
-
-If you are targetting F4, you _need_ to use texane's master
-
-If you are targetting F2 or L1, please let us know how it goes!
-
 HOWTO
 =====
 
@@ -136,7 +128,7 @@ STLink v1 (as found on the 32VL Discovery board)
 
 Known Working Targets:
 * STM32F100xx (Medium Density VL)
-* STM32F103 (according to jpa- o n##stm32
+* STM32F103 (according to jpa- on ##stm32
 
 No information:
 * everything else!