branch develop-2.x updated (49a32d0 -> 6396631)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git omits 49a32d0 Merge branch 'feature/3833' into 'develop-2.x' new 6396631 Fixes #3833. Merge branch 'feature/3833' into 'develop-2.x' This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (49a32d0) \ N -- N -- N refs/heads/develop-2.x (6396631) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 639663181415515d148b0c353c612bd199d2b633 Merge: 2fcabe7 54c393e Author: Tony Chemit <chemit@codelutin.com> Date: Thu Dec 24 10:28:49 2015 +0100 Fixes #3833. Merge branch 'feature/3833' into 'develop-2.x' See merge request !1 Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 639663181415515d148b0c353c612bd199d2b633 Merge: 2fcabe7 54c393e Author: Tony Chemit <chemit@codelutin.com> Date: Thu Dec 24 10:28:49 2015 +0100 Fixes #3833. Merge branch 'feature/3833' into 'develop-2.x' See merge request !1 .../swing/editor/SimpleTimeEditorHandler.java | 78 +++++++++++++++------- 1 file changed, 54 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm