Remove the "merge in progress" notice
authorKarl Palsson <karlp@tweak.net.au>
Tue, 15 Nov 2011 01:42:47 +0000 (01:42 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Wed, 1 Feb 2012 21:20:48 +0000 (21:20 +0000)
README

diff --git a/README b/README
index 1eb6d26173fa48103d0036d284afa27889eb22c1..838484ee46f88d423b157640d9eea2d1c5cd579d 100644 (file)
--- 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- o##stm32
 
 No information:
 * everything else!