Ignore:
Timestamp:
May 25, 2012, 1:53:43 AM (10 years ago)
Author:
ezyang
Message:
Merge zephyr from trunk.
Location:
branches/fc17-dev
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

    • Property svn:mergeinfo changed
      /trunkmerged: 2209
  • branches/fc17-dev/server/fedora/Makefile

    r2208 r2210  
    4141server_arch     = "fedora.stable"
    4242openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"
    43 zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
     43zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.2.tar.gz"
    4444
    4545PKG             = $(patsubst %.i686,%,$@)
  • branches/fc17-dev/server/fedora/specs/zephyr.spec

    r2066 r2210  
    11Name:           zephyr
    2 Version:        3.0.1
     2Version:        3.0.2
    33Release:        0.%{scriptsversion}%{?dist}
    44Summary:        Client programs for the Zephyr real-time messaging system
Note: See TracChangeset for help on using the changeset viewer.