[tzdata/f15: 5/5] Merge branch 'master' into f15
Petr Machata
pmachata at fedoraproject.org
Wed Sep 21 19:22:41 UTC 2011
commit 3e3100ae4ffc71e1fb5171ca0586bf20a3b19db9
Merge: c7f5e9c 9d2390c
Author: Petr Machata <pmachata at redhat.com>
Date: Wed Sep 21 21:20:11 2011 +0200
Merge branch 'master' into f15
Conflicts:
.gitignore
sources
tzdata-2011h-kemerovo.patch
tzdata-2011i-kemerovo.patch
tzdata-2011j-kemerovo.patch
tzdata.spec
.gitignore | 1 +
sources | 2 +-
tzdata-2011j-k.patch | 451 ++++++++++++++++++++
...i-kemerovo.patch => tzdata-2011j-kemerovo.patch | 4 +-
tzdata.spec | 21 +-
5 files changed, 472 insertions(+), 7 deletions(-)
---
More information about the scm-commits
mailing list