[eclipse-gef/f17: 3/3] Merge branch 'f17'

Krzysztof Daniel kdaniel at fedoraproject.org
Tue Apr 17 10:49:05 UTC 2012


commit 149521ef80354708c11f5727fcf912e2adb2815c
Merge: 4b18d42 fd64acd
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Apr 17 12:42:24 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	.gitignore
    	eclipse-gef-fix-doc.patch
    	eclipse-gef.spec

 .gitignore                |    1 +
 customBuildCallbacks.xml  |  155 +++++++++++++++++++++++++++++++++++++++++++++
 eclipse-gef-fix-doc.patch |   75 ++++++++++++++++++++++
 eclipse-gef.spec          |   12 +++-
 4 files changed, 242 insertions(+), 1 deletions(-)
---


More information about the scm-commits mailing list