[kross-interpreters/f16: 12/12] Merge remote-tracking branch 'origin/f17' into f16

Rex Dieter rdieter at fedoraproject.org
Thu Mar 8 06:45:50 UTC 2012


commit 663a73f538a56f484c6f8e3080536e6e215f703d
Merge: 5f1f2c2 4f88558
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:47:20 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kross-interpreters.spec
    	sources

 .gitignore              |    3 +-
 kross-interpreters.spec |   51 ++++++++++++++++++++++++++++++++++++----------
 sources                 |    2 +-
 3 files changed, 42 insertions(+), 14 deletions(-)
---


More information about the scm-commits mailing list