merge

markbirss · Jun 1, 2016 · 77475f8 · 77475f8
1 parent c7cfb8a
commit 77475f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -159,9 +159,13 @@ u8glib ChangeLog
   * Fixed bug in u8g_DrawLine(), Github issue 343 
   * Fixed bug in u8g_DrawStr90P(), Github issue 331
   * Support for SSD1306 with 64x48 pixel
-2016-04-05	v1.19	
+2016-04-05	v1.19		  Oliver Kraus <[email protected]>
   * Fixed contrast (brightness) setting for SH1106 and SSD1306 devices
   * Fixed compiler warnings
+2016-05-24	v1.20	  Oliver Kraus <[email protected]>
+  * Experimental support for LD7032 I2C
+  * HW SPI Support for ATMega128
+
 
 
 
diff --git a/tools/release/print_release.sh b/tools/release/print_release.sh
@@ -1,2 +1,2 @@
 # without 'v' prefix
-echo -n "1.19.1"
+echo -n "1.20.0"