[gnome-sudoku/vala-port: 5/5] Merge branch 'master' into vala-port

From: Michael Catanzaro <mcatanzaro src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-sudoku/vala-port: 5/5] Merge branch 'master' into vala-port
Date: Sat, 22 Feb 2014 16:36:40 +0000 (UTC)

commit 65c61e0758f7833fe52ebae8199c4e235e49d3aa
Merge: c778534 842b9d1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Feb 22 10:30:57 2014 -0600

    Merge branch 'master' into vala-port
    
    Conflicts:
        src/lib/dancer.py
        src/lib/sudoku.py

 NEWS         |   10 +++
 configure.ac |    2 +-
 po/de.po     |  251 +++++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 171 insertions(+), 92 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]