diff options
author | Keith Packard <keithp@keithp.com> | 2014-11-24 15:39:51 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-11-24 15:39:51 -0800 |
commit | ec0ac8970b508adcbc3d104b14a127118e4979d0 (patch) | |
tree | b1d39be7b2c83a1f85efd469105fb8a3c0fe8d6d /include/xkbfile.h | |
parent | 65cc0982afb1d47d17e655efaef40d4a82e7574a (diff) | |
parent | 0f88d4e7937116dbc438f98ddf1f3d94cfc5bead (diff) |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include/xkbfile.h')
-rw-r--r-- | include/xkbfile.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/xkbfile.h b/include/xkbfile.h index 9f3b04c30..f93d31ab0 100644 --- a/include/xkbfile.h +++ b/include/xkbfile.h @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |