[pygtk/windows: 6/7] Merge branch 'master' into windows

From: Dieter Verfaillie <dieterv src gnome org>
To: commits-list gnome org
Cc:
Subject: [pygtk/windows: 6/7] Merge branch 'master' into windows
Date: Sat, 9 Apr 2011 12:04:08 +0000 (UTC)

commit b92f9f2a9a987dac45bbef586d3bd910b13b1156
Merge: 7063cda 5bee5a7
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date:   Mon Apr 4 18:08:45 2011 +0200

    Merge branch 'master' into windows
    
    Conflicts:
    	configure.ac

 NEWS         |    9 +++++++--
 README       |   45 +++++++++++++++++++--------------------------
 configure.ac |   12 ++++++++----
 setup.py     |    3 +++
 4 files changed, 37 insertions(+), 32 deletions(-)
---

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