[erlang-ibrowse/el6/master: 5/5] Merge branch 'master' into el6/master
Peter Lemenkov
peter at fedoraproject.org
Tue Sep 28 09:38:48 UTC 2010
commit 4efbee288b4a80b0d0015b59959531cfa7983793
Merge: 136eac7 1d50292
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Sep 28 13:38:40 2010 +0400
Merge branch 'master' into el6/master
Conflicts:
.gitignore
erlang-ibrowse.spec
sources
.gitignore | 1 +
erlang-ibrowse.spec | 32 ++++++++++++++++++--------------
sources | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
---
More information about the scm-commits
mailing list