Ignore:
Timestamp:
Jul 12, 2013 11:01:05 AM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
d0d990c
Parents:
62e1cad (diff), c71b68c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/configDialog.h

    r78fa8b2 rc71b68c  
     1/*************************************************************************** 
     2 *   Copyright (C) 2011 - iXsystems                                       * 
     3 *   kris@pcbsd.org  * 
     4 *   tim@pcbsd.org   * 
     5 *   ken@pcbsd.org   * 
     6 *                                                                         * 
     7 *   Permission is hereby granted, free of charge, to any person obtaining * 
     8 *   a copy of this software and associated documentation files (the       * 
     9 *   "Software"), to deal in the Software without restriction, including   * 
     10 *   without limitation the rights to use, copy, modify, merge, publish,   * 
     11 *   distribute, sublicense, and/or sell copies of the Software, and to    * 
     12 *   permit persons to whom the Software is furnished to do so, subject to * 
     13 *   the following conditions:                                             * 
     14 *                                                                         * 
     15 *   The above copyright notice and this permission notice shall be        * 
     16 *   included in all copies or substantial portions of the Software.       * 
     17 *                                                                         * 
     18 *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       * 
     19 *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    * 
     20 *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 
     21 *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR     * 
     22 *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * 
     23 *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * 
     24 *   OTHER DEALINGS IN THE SOFTWARE.                                       * 
     25 ***************************************************************************/ 
    126#ifndef _APPCAFE_CONFIG_DIALOG_H 
    227#define _APPCAFE_CONFIG_DIALOG_H 
Note: See TracChangeset for help on using the changeset viewer.