[mlton/f12/master: 10/10] Merge branch 'f12' into el6

Adam Goode agoode at fedoraproject.org
Sat Jul 31 00:51:08 UTC 2010


commit 0cebc1fd0e62294dc0dc2bbf09322ec4d842415b
Merge: 27f0aa4 883eafc
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 20:49:40 2010 -0400

    Merge branch 'f12' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                        |    2 +-
 mlton-20070826-arm.patch          |   35 ----------------------------
 mlton-20070826-debuginfo.patch    |   21 -----------------
 mlton-20100608-no-execstack.patch |   12 ++++++++++
 mlton.spec                        |   45 +++++++++++++++---------------------
 sources                           |    2 +-
 6 files changed, 33 insertions(+), 84 deletions(-)
---


More information about the scm-commits mailing list