Permalink
Browse files

Merge branch 'master' of ssh://git@ssh.github.com:443/HanSolo/SteelSe…

…ries-Canvas.git

Conflicts:
	ChangeLog.txt
  • Loading branch information...
2 parents a4c5a0c + 604b25f commit b27657f30d9d6940c77601d13b56fe3d5cb6455e @mcrossley mcrossley committed Jan 13, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 ChangeLog.txt
View
@@ -5,9 +5,9 @@ v0.9.11
* Fixed misalignment of threshold indicator
> RadialVertical
* Fixed min/max indicators not displaying in correct place in orientation:North, and
- not displaying at all in orientation:West
+ not displaying at all in orientation:Wes
> General Changes
- * Added new LCD colours AMBER and LIGHTBLUE
+ * Added new LCD colours AMBER and LIGHTBLUE
v0.9.10
> General Changes

0 comments on commit b27657f

Please sign in to comment.