[MERGE FAILED] fdo#63154: Change macros Min/Max for std::min/max

"David Tardon (via Code Review)" <gerrit -AT- gerrit.libreoffice.org>
Sat, 20 Apr 2013 10:56:12 +0000

David Tardon has submitted this change and it FAILED to merge.

Change subject: fdo#63154: Change macros Min/Max for std::min/max
......................................................................


Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-- 
To view, visit https://gerrit.libreoffice.org/3326
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merge-failed
Gerrit-Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>
Gerrit-Reviewer: Chris Sherlock <chris.sherlock79@gmail.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
Gerrit-Reviewer: Eike Rathke <erack@redhat.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org>
Gerrit-Reviewer: Marcos Souza <marcos.souza.org@gmail.com>
Gerrit-Reviewer: Michael Meeks <michael.meeks@suse.com>

Context

[PATCH] fdo#63154: Change macros Min/Max for std::min/max · Marcos Souza (via Code Review)
- [PATCH] fdo#63154: Change macros Min/Max for std::min/max · Marcos Souza (via Code Review)
- [PATCH] fdo#63154: Change macros Min/Max for std::min/max · Marcos Souza (via Code Review)
- [MERGE FAILED] fdo#63154: Change macros Min/Max for std::min/max · David Tardon (via Code Review)
- [PATCH] fdo#63154: Change Min/Max/Abs for std::min/max/abs · David Tardon (via Code Review)
- [PUSHED] fdo#63154: Change Min/Max/Abs for std::min/max/abs · David Tardon (via Code Review)

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.