[gliv/f13/master: 3/3] Merge branch 'master' into f13/master
Peter Lemenkov
peter at fedoraproject.org
Mon Aug 30 11:33:00 UTC 2010
commit 3f88657e88883b4a462a55809e9cba70301a5589
Merge: 1afc5cc 65ebc0a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Aug 30 15:32:35 2010 +0400
Merge branch 'master' into f13/master
Conflicts:
.gitignore
...t-with-NULL-returned-from-get_terminal_ou.patch | 46 +++++++++++++
gliv.applications | 10 +++
gliv.desktop | 11 +++
gliv.spec | 71 +++++++------------
4 files changed, 93 insertions(+), 45 deletions(-)
---
More information about the scm-commits
mailing list