[pkg-fso-commits] [SCM] mokomaze branch, debian, updated. debian/0.2.2-1-26-gc365918

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 2b1de5877921b8649e60b60c98ee32262921ed78
Merge: 79c529bf06ca0f6592caa4732c4acaf367ab8b90 323ab035f6ff123b967c7453cf2a22a8406c4dee
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jul 28 14:46:29 2009 +0200

    Merge commit 'upstream/0.5.5+git8' into debian
    
    Conflicts:
    	ChangeLog
    	data/mokomaze.desktop

diff --combined data/mokomaze.desktop
index 1f5f838,cdfa2ea..4866d7b
--- a/data/mokomaze.desktop
+++ b/data/mokomaze.desktop
@@@ -2,13 -2,9 +2,9 @@@
  Name=Mokomaze
  Comment=Ball-in-the-labyrinth game
  Encoding=UTF-8
- <<<<<<< HEAD:data/mokomaze.desktop
  Version=0.5
- =======
- Version=0.2.3
- >>>>>>> alioth/debian:data/mokomaze.desktop
  Type=Application
 -Exec=mokomaze
 +Exec=/usr/games/mokomaze
  Terminal=false
  Categories=Game;
  X-MB-SingleInstance=true

-- 
mokomaze