Ignore:
Timestamp:
May 25, 2012, 1:52:33 AM (12 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

    • Property svn:mergeinfo changed
      /trunkmerged: 2203

  • branches/fc17-dev/server/fedora/Makefile

    r2206 r2208  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh rubygems php
     21upstream_yum    = krb5 krb5.i686 httpd openssh rubygems
    2222hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
Note: See TracChangeset for help on using the changeset viewer.