[SCM] general-purpose neural simulator branch, master, updated. upstream/2.3+dfsg-22-g1826236

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 0e8429c3bab920b0047b505b79a2e3dd53baac73
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Dec 11 00:33:26 2011 +0100

    Remove encoding from .desktop

diff --git a/debian/genesis.desktop b/debian/genesis.desktop
index eefb154..f9f4ef1 100644
--- a/debian/genesis.desktop
+++ b/debian/genesis.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=GENESIS Neural Simulator
 GenericName=Neural Simulator
 Comment=Simulate different types of neural systems

-- 
general-purpose neural simulator