From d8f74f2c8e65bab0088124b71b7dc3254e4c8244 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 4 Mar 2012 19:49:55 +0000
Subject: [PATCH] ChangeLog + I forgot to commit xbm2lbm

---
 changelog.txt   | 12 ++++++++++--
 util/xbm2lbm.rb | 11 +++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index d81046837..4b47cbb87 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,12 +1,20 @@
 ******************************************
-CHANGELOG: 02-03-2012  BSS
-MAX changed to HALF (idea from er9x)
+CHANGELOG: 04-03-2012  BSS
+New EEPROM format 205
+Introduction of differential in Mixers
+Introduction of Switches as Mixer Source (FULL now removed)
+Negative curves in Mixers
+Optimizations in Mixer
+Extended chars for localization
+Swedish translations
+Beep length updated
 
 ******************************************
 CHANGELOG: 01-03-2012  BSS
 Feature "Use THR trim as a slider" now finished
 [FrSky] Jitter (2us) introduced by last optimization removed
 Trim parameter in Mixer is OFF if the source is not a stick
+GPS distance fixed
 
 ******************************************
 
diff --git a/util/xbm2lbm.rb b/util/xbm2lbm.rb
index 5d83f0f47..30c3dac75 100644
--- a/util/xbm2lbm.rb
+++ b/util/xbm2lbm.rb
@@ -1,11 +1,8 @@
 #! /usr/bin/env ruby
 
-
 require 'pp'
 
-
-
-def main(xbm)
+def main(header, xbm)
   base=xbm.sub(/\.xbm/,"")
   cols,rows=1,1
   if base.sub! /_(\d+)x(\d+)/,""
@@ -35,7 +32,9 @@ def main(xbm)
 
   File.open("#{base}.lbm","w"){|f|
     col=0
-    f.printf("%d,%d,\n",w/cols,h/rows)
+    if header == "yes"
+      f.printf("%d,%d,\n",w/cols,h/rows)
+    end
     rows.times{|row|
       (hb/rows).times{|yb| yb
         w.times{|xp|
@@ -48,4 +47,4 @@ def main(xbm)
 end
 
 
-main(ARGV[0])
+main(ARGV[0], ARGV[1])