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

From: Michael Catanzaro <mcatanzaro src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-sudoku/vala-port: 4/4] Merge branch 'master' into vala-port
Date: Sat, 7 Dec 2013 00:23:15 +0000 (UTC)

commit aa7154cf4e6af59768d8bc50ea14a651ebb53e96
Merge: 795ea90 4e8751f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Dec 6 18:23:01 2013 -0600

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

 data/gnome-sudoku.appdata.xml.in |    2 +-
 help/el/el.po                    |  797 +++++++++++++++++++++++---------------
 2 files changed, 493 insertions(+), 306 deletions(-)
---

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