Copyright (c) Perforce Software, Inc., 2011-2024. All rights reserved
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1 Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PERFORCE
SOFTWARE, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #2 | 30554 | C. Thomas Tyler |
A few refresher changes: * Updated copyrights for this project (2011 to 2024). * Fixed various doc typos and broken email links. * Tweaked comments in code to refer to modern SDP location for password files and to use /p4/common/site/automerge as the home directory, following the modern SDP covention using the 'site' directory. * Fixed a broken link to the long-gone blog article "Living on the Edge - Automatic Merging" by adding the article in the new 'docs' folder (adding the original Word doc and converting to HTML). No functional changes. |
||
| #1 | 30552 | C. Thomas Tyler |
Populate //guest/perforce_software/automerge/main/... //automerge/main/.... |
||
| //guest/perforce_software/automerge/main/LICENSE | |||||
| #1 | 15899 | Matt Attaway | Add a 2 clause BSD license to the automerge project | ||