[pkg-fso-commits] [xf86-video-glamo] 05/11: Merge branch 'debian' of git+ssh://git.debian.org/git/pkg-fso/xf86-video-glamo into debian

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch debian
in repository xf86-video-glamo.

commit 56264d00326fd05532b9d8cf9b6dfbf431bfac9c
Merge: 0c68cce b919358
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Sep 23 11:25:42 2013 +0200

    Merge branch 'debian' of git+ssh://git.debian.org/git/pkg-fso/xf86-video-glamo into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog |   15 ++++-----------
 src/glamo-drm.c  |   16 +++++++++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/xf86-video-glamo.git