You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@flex.apache.org by pi...@apache.org on 2015/01/26 23:05:33 UTC

[56/56] [abbrv] git commit: [flex-utilities] [refs/heads/develop] - Merge branch 'patch-1' of https://github.com/solomax/flex-utilities into develop

Merge branch 'patch-1' of https://github.com/solomax/flex-utilities into develop

Conflicts:
	installer/src/properties/ru_RU.properties


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/13ffbaff
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/13ffbaff
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/13ffbaff

Branch: refs/heads/develop
Commit: 13ffbaff9d6c1abf32eb5d3711342698425e1a99
Parents: 0649b10 c7c9c8c
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 26 23:03:57 2015 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 26 23:03:57 2015 +0100

----------------------------------------------------------------------
 installer/src/properties/ru_RU.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------