[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    [geany-plugins: 3/3] Merge remote branch 'origin/f13/master'
From:       Dominic Hopf <dmaphy () fedoraproject ! org>
Date:       2010-07-31 23:38:33
Message-ID: 20100731233833.2F26627DE0 () pkgs01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

commit eadc7e0e2188d06d9b22241bf08c21d79d1c1470
Merge: 61234ba 0df2c75
Author: Dominic Hopf <dmaphy@fedoraproject.org>
Date:   Sun Aug 1 01:37:04 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
-- 
scm-commits mailing list
scm-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/scm-commits
[prev in list] [next in list] [prev in thread] [next in thread]