From 8a32fc9fe9cf16ea19d13de296e6d4ae09b5be96 Mon Sep 17 00:00:00 2001
From: andy1138 <andy@hicks.net>
Date: Mon, 21 Jul 2014 21:06:33 +0100
Subject: [PATCH 1/4] Adds scaladoc notes to read me

---
 README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 774f865f..3cb0f387 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,20 @@ The library comprises three main packages:
 - `scala.swing`: All widget classes and traits.
 - `scala.swing.event`: The event hierarchy.
 - `scala.swing.test`: A set of demos.
-    
 
-Notes:
+<br>
+
+ScalaDocs
+===
+
+Documentation for scala-swing included in 2.11.1 is can be found [here](http://www.scala-lang.org/api/2.11.1/scala-swing/#scala.swing.package)
+
+Other version can be found at [http://www.scala-lang.org/documentation/api.html](http://www.scala-lang.org/documentation/api.html) 
+
+
+<br><br>
+
+_Notes:_
 
 - Visual appearance of combo boxes using the GTK LaF is broken on JDKs < 1.7b30. This is a Java Swing problem.
+

From e90328cbda993c5015536095418943a9e3897c7e Mon Sep 17 00:00:00 2001
From: andy1138 <andy@hicks.net>
Date: Tue, 22 Jul 2014 10:39:15 +0100
Subject: [PATCH 2/4] adds 'current work'

---
 README.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3cb0f387..16aeb321 100644
--- a/README.md
+++ b/README.md
@@ -31,16 +31,27 @@ The library comprises three main packages:
 <br>
 
 ScalaDocs
-===
+---
 
 Documentation for scala-swing included in 2.11.1 is can be found [here](http://www.scala-lang.org/api/2.11.1/scala-swing/#scala.swing.package)
 
 Other version can be found at [http://www.scala-lang.org/documentation/api.html](http://www.scala-lang.org/documentation/api.html) 
 
+<br><br>
+
+Current Work
+---
+
+Current changes are being made on the **java7** branch. This is to mainly because of the EOL of java6 and the generification that happened between jdk6 and jdk7 requiring a difference in the source code. This class files are targeted at java6 and will run with all versions upwards. 
 
 <br><br>
 
 _Notes:_
 
 - Visual appearance of combo boxes using the GTK LaF is broken on JDKs < 1.7b30. This is a Java Swing problem.
+- The generification added to some java7 swing components make the course code incompatible between java6 and java7. This is not an issue with the generated .class files because of _Type Erasure_ will work across all versions of java from java6 upwards. See [Issue SI-3634](https://issues.scala-lang.org/browse/SI-3634)
+
+
+
+
 

From 64b40bfb9104afa2905b3a181fbb3a24f1af2f06 Mon Sep 17 00:00:00 2001
From: andy1138 <andy@hicks.net>
Date: Tue, 22 Jul 2014 10:39:55 +0100
Subject: [PATCH 3/4] Corrects path to demos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 16aeb321..cafd3152 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ The library comprises three main packages:
 
 - `scala.swing`: All widget classes and traits.
 - `scala.swing.event`: The event hierarchy.
-- `scala.swing.test`: A set of demos.
+- `examples.swing`: A set of demos. ( in ./docs )
 
 <br>
 

From 4552a5e6e20465cb5da8fcb6e75e078c258c35b0 Mon Sep 17 00:00:00 2001
From: Andy Hicks <andy@hicks.net>
Date: Tue, 22 Jul 2014 10:44:24 +0100
Subject: [PATCH 4/4] bit of readme.md layout cleanup

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cafd3152..eaccda53 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ The library comprises three main packages:
 - `scala.swing.event`: The event hierarchy.
 - `examples.swing`: A set of demos. ( in ./docs )
 
-<br>
 
 ScalaDocs
 ---
@@ -37,14 +36,13 @@ Documentation for scala-swing included in 2.11.1 is can be found [here](http://w
 
 Other version can be found at [http://www.scala-lang.org/documentation/api.html](http://www.scala-lang.org/documentation/api.html) 
 
-<br><br>
 
 Current Work
 ---
 
 Current changes are being made on the **java7** branch. This is to mainly because of the EOL of java6 and the generification that happened between jdk6 and jdk7 requiring a difference in the source code. This class files are targeted at java6 and will run with all versions upwards. 
 
-<br><br>
+<br>
 
 _Notes:_