Alexandre Julliard : Merge branch 'upstream'.
Alexandre Julliard
julliard at winehq.org
Wed Feb 19 07:03:18 CST 2014
Module: bugzilla
Branch: master
Commit: 1f26103c851fd802e9401ace3bf9fba5aa046140
URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1f26103c851fd802e9401ace3bf9fba5aa046140
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 19 13:19:02 2014 +0100
Merge branch 'upstream'.
Conflicts:
template/en/default/account/create.html.tmpl
template/en/default/bug/create/user-message.html.tmpl
template/en/default/global/common-links.html.tmpl
---
More information about the wine-cvs
mailing list