- Timestamp:
- Jul 7, 2010, 5:29:41 PM (15 years ago)
- Branches:
- Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
- Children:
- 8e463e, be97a8
- Parents:
- ed6dd8 (diff), b21cb9 (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. - git-author:
- Frederik Heber <heber@…> (07/07/10 17:27:39)
- git-committer:
- Frederik Heber <heber@…> (07/07/10 17:29:41)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
COPYING
red6dd8 rba9f5b 1 <<<<<<< HEAD 1 2 GNU GENERAL PUBLIC LICENSE 2 3 Version 3, 29 June 2007 … … 18 19 GNU General Public License for most of our software; it applies also to 19 20 any other work released this way by its authors. You can apply it to 21 ======= 22 GNU GENERAL PUBLIC LICENSE 23 Version 2, June 1991 24 25 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 26 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 27 Everyone is permitted to copy and distribute verbatim copies 28 of this license document, but changing it is not allowed. 29 30 Preamble 31 32 The licenses for most software are designed to take away your 33 freedom to share and change it. By contrast, the GNU General Public 34 License is intended to guarantee your freedom to share and change free 35 software--to make sure the software is free for all its users. This 36 General Public License applies to most of the Free Software 37 Foundation's software and to any other program whose authors commit to 38 using it. (Some other Free Software Foundation software is covered by 39 the GNU Library General Public License instead.) You can apply it to 40 >>>>>>> FETCH_HEAD 20 41 your programs, too. 21 42 … … 23 44 price. Our General Public Licenses are designed to make sure that you 24 45 have the freedom to distribute copies of free software (and charge for 46 <<<<<<< HEAD 25 47 them if you wish), that you receive source code or can get it if you 26 48 want it, that you can change the software or use pieces of it in new … … 622 644 623 645 How to Apply These Terms to Your New Programs 646 ======= 647 this service if you wish), that you receive source code or can get it 648 if you want it, that you can change the software or use pieces of it 649 in new free programs; and that you know you can do these things. 650 651 To protect your rights, we need to make restrictions that forbid 652 anyone to deny you these rights or to ask you to surrender the rights. 653 These restrictions translate to certain responsibilities for you if you 654 distribute copies of the software, or if you modify it. 655 656 For example, if you distribute copies of such a program, whether 657 gratis or for a fee, you must give the recipients all the rights that 658 you have. You must make sure that they, too, receive or can get the 659 source code. And you must show them these terms so they know their 660 rights. 661 662 We protect your rights with two steps: (1) copyright the software, and 663 (2) offer you this license which gives you legal permission to copy, 664 distribute and/or modify the software. 665 666 Also, for each author's protection and ours, we want to make certain 667 that everyone understands that there is no warranty for this free 668 software. If the software is modified by someone else and passed on, we 669 want its recipients to know that what they have is not the original, so 670 that any problems introduced by others will not reflect on the original 671 authors' reputations. 672 673 Finally, any free program is threatened constantly by software 674 patents. We wish to avoid the danger that redistributors of a free 675 program will individually obtain patent licenses, in effect making the 676 program proprietary. To prevent this, we have made it clear that any 677 patent must be licensed for everyone's free use or not licensed at all. 678 679 The precise terms and conditions for copying, distribution and 680 modification follow. 681 682 683 GNU GENERAL PUBLIC LICENSE 684 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 685 686 0. This License applies to any program or other work which contains 687 a notice placed by the copyright holder saying it may be distributed 688 under the terms of this General Public License. The "Program", below, 689 refers to any such program or work, and a "work based on the Program" 690 means either the Program or any derivative work under copyright law: 691 that is to say, a work containing the Program or a portion of it, 692 either verbatim or with modifications and/or translated into another 693 language. (Hereinafter, translation is included without limitation in 694 the term "modification".) Each licensee is addressed as "you". 695 696 Activities other than copying, distribution and modification are not 697 covered by this License; they are outside its scope. The act of 698 running the Program is not restricted, and the output from the Program 699 is covered only if its contents constitute a work based on the 700 Program (independent of having been made by running the Program). 701 Whether that is true depends on what the Program does. 702 703 1. You may copy and distribute verbatim copies of the Program's 704 source code as you receive it, in any medium, provided that you 705 conspicuously and appropriately publish on each copy an appropriate 706 copyright notice and disclaimer of warranty; keep intact all the 707 notices that refer to this License and to the absence of any warranty; 708 and give any other recipients of the Program a copy of this License 709 along with the Program. 710 711 You may charge a fee for the physical act of transferring a copy, and 712 you may at your option offer warranty protection in exchange for a fee. 713 714 2. You may modify your copy or copies of the Program or any portion 715 of it, thus forming a work based on the Program, and copy and 716 distribute such modifications or work under the terms of Section 1 717 above, provided that you also meet all of these conditions: 718 719 a) You must cause the modified files to carry prominent notices 720 stating that you changed the files and the date of any change. 721 722 b) You must cause any work that you distribute or publish, that in 723 whole or in part contains or is derived from the Program or any 724 part thereof, to be licensed as a whole at no charge to all third 725 parties under the terms of this License. 726 727 c) If the modified program normally reads commands interactively 728 when run, you must cause it, when started running for such 729 interactive use in the most ordinary way, to print or display an 730 announcement including an appropriate copyright notice and a 731 notice that there is no warranty (or else, saying that you provide 732 a warranty) and that users may redistribute the program under 733 these conditions, and telling the user how to view a copy of this 734 License. (Exception: if the Program itself is interactive but 735 does not normally print such an announcement, your work based on 736 the Program is not required to print an announcement.) 737 738 739 These requirements apply to the modified work as a whole. If 740 identifiable sections of that work are not derived from the Program, 741 and can be reasonably considered independent and separate works in 742 themselves, then this License, and its terms, do not apply to those 743 sections when you distribute them as separate works. But when you 744 distribute the same sections as part of a whole which is a work based 745 on the Program, the distribution of the whole must be on the terms of 746 this License, whose permissions for other licensees extend to the 747 entire whole, and thus to each and every part regardless of who wrote it. 748 749 Thus, it is not the intent of this section to claim rights or contest 750 your rights to work written entirely by you; rather, the intent is to 751 exercise the right to control the distribution of derivative or 752 collective works based on the Program. 753 754 In addition, mere aggregation of another work not based on the Program 755 with the Program (or with a work based on the Program) on a volume of 756 a storage or distribution medium does not bring the other work under 757 the scope of this License. 758 759 3. You may copy and distribute the Program (or a work based on it, 760 under Section 2) in object code or executable form under the terms of 761 Sections 1 and 2 above provided that you also do one of the following: 762 763 a) Accompany it with the complete corresponding machine-readable 764 source code, which must be distributed under the terms of Sections 765 1 and 2 above on a medium customarily used for software interchange; or, 766 767 b) Accompany it with a written offer, valid for at least three 768 years, to give any third party, for a charge no more than your 769 cost of physically performing source distribution, a complete 770 machine-readable copy of the corresponding source code, to be 771 distributed under the terms of Sections 1 and 2 above on a medium 772 customarily used for software interchange; or, 773 774 c) Accompany it with the information you received as to the offer 775 to distribute corresponding source code. (This alternative is 776 allowed only for noncommercial distribution and only if you 777 received the program in object code or executable form with such 778 an offer, in accord with Subsection b above.) 779 780 The source code for a work means the preferred form of the work for 781 making modifications to it. For an executable work, complete source 782 code means all the source code for all modules it contains, plus any 783 associated interface definition files, plus the scripts used to 784 control compilation and installation of the executable. However, as a 785 special exception, the source code distributed need not include 786 anything that is normally distributed (in either source or binary 787 form) with the major components (compiler, kernel, and so on) of the 788 operating system on which the executable runs, unless that component 789 itself accompanies the executable. 790 791 If distribution of executable or object code is made by offering 792 access to copy from a designated place, then offering equivalent 793 access to copy the source code from the same place counts as 794 distribution of the source code, even though third parties are not 795 compelled to copy the source along with the object code. 796 797 798 4. You may not copy, modify, sublicense, or distribute the Program 799 except as expressly provided under this License. Any attempt 800 otherwise to copy, modify, sublicense or distribute the Program is 801 void, and will automatically terminate your rights under this License. 802 However, parties who have received copies, or rights, from you under 803 this License will not have their licenses terminated so long as such 804 parties remain in full compliance. 805 806 5. You are not required to accept this License, since you have not 807 signed it. However, nothing else grants you permission to modify or 808 distribute the Program or its derivative works. These actions are 809 prohibited by law if you do not accept this License. Therefore, by 810 modifying or distributing the Program (or any work based on the 811 Program), you indicate your acceptance of this License to do so, and 812 all its terms and conditions for copying, distributing or modifying 813 the Program or works based on it. 814 815 6. Each time you redistribute the Program (or any work based on the 816 Program), the recipient automatically receives a license from the 817 original licensor to copy, distribute or modify the Program subject to 818 these terms and conditions. You may not impose any further 819 restrictions on the recipients' exercise of the rights granted herein. 820 You are not responsible for enforcing compliance by third parties to 821 this License. 822 823 7. If, as a consequence of a court judgment or allegation of patent 824 infringement or for any other reason (not limited to patent issues), 825 conditions are imposed on you (whether by court order, agreement or 826 otherwise) that contradict the conditions of this License, they do not 827 excuse you from the conditions of this License. If you cannot 828 distribute so as to satisfy simultaneously your obligations under this 829 License and any other pertinent obligations, then as a consequence you 830 may not distribute the Program at all. For example, if a patent 831 license would not permit royalty-free redistribution of the Program by 832 all those who receive copies directly or indirectly through you, then 833 the only way you could satisfy both it and this License would be to 834 refrain entirely from distribution of the Program. 835 836 If any portion of this section is held invalid or unenforceable under 837 any particular circumstance, the balance of the section is intended to 838 apply and the section as a whole is intended to apply in other 839 circumstances. 840 841 It is not the purpose of this section to induce you to infringe any 842 patents or other property right claims or to contest validity of any 843 such claims; this section has the sole purpose of protecting the 844 integrity of the free software distribution system, which is 845 implemented by public license practices. Many people have made 846 generous contributions to the wide range of software distributed 847 through that system in reliance on consistent application of that 848 system; it is up to the author/donor to decide if he or she is willing 849 to distribute software through any other system and a licensee cannot 850 impose that choice. 851 852 This section is intended to make thoroughly clear what is believed to 853 be a consequence of the rest of this License. 854 855 856 8. If the distribution and/or use of the Program is restricted in 857 certain countries either by patents or by copyrighted interfaces, the 858 original copyright holder who places the Program under this License 859 may add an explicit geographical distribution limitation excluding 860 those countries, so that distribution is permitted only in or among 861 countries not thus excluded. In such case, this License incorporates 862 the limitation as if written in the body of this License. 863 864 9. The Free Software Foundation may publish revised and/or new versions 865 of the General Public License from time to time. Such new versions will 866 be similar in spirit to the present version, but may differ in detail to 867 address new problems or concerns. 868 869 Each version is given a distinguishing version number. If the Program 870 specifies a version number of this License which applies to it and "any 871 later version", you have the option of following the terms and conditions 872 either of that version or of any later version published by the Free 873 Software Foundation. If the Program does not specify a version number of 874 this License, you may choose any version ever published by the Free Software 875 Foundation. 876 877 10. If you wish to incorporate parts of the Program into other free 878 programs whose distribution conditions are different, write to the author 879 to ask for permission. For software which is copyrighted by the Free 880 Software Foundation, write to the Free Software Foundation; we sometimes 881 make exceptions for this. Our decision will be guided by the two goals 882 of preserving the free status of all derivatives of our free software and 883 of promoting the sharing and reuse of software generally. 884 885 NO WARRANTY 886 887 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 888 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 889 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 890 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 891 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 892 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 893 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 894 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 895 REPAIR OR CORRECTION. 896 897 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 898 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 899 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 900 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 901 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 902 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 903 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 904 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 905 POSSIBILITY OF SUCH DAMAGES. 906 907 END OF TERMS AND CONDITIONS 908 909 910 How to Apply These Terms to Your New Programs 911 >>>>>>> FETCH_HEAD 624 912 625 913 If you develop a new program, and you want it to be of the greatest … … 629 917 To do so, attach the following notices to the program. It is safest 630 918 to attach them to the start of each source file to most effectively 919 <<<<<<< HEAD 631 920 state the exclusion of warranty; and each file should have at least 921 ======= 922 convey the exclusion of warranty; and each file should have at least 923 >>>>>>> FETCH_HEAD 632 924 the "copyright" line and a pointer to where the full notice is found. 633 925 … … 635 927 Copyright (C) <year> <name of author> 636 928 929 <<<<<<< HEAD 637 930 This program is free software: you can redistribute it and/or modify 638 931 it under the terms of the GNU General Public License as published by 639 932 the Free Software Foundation, either version 3 of the License, or 933 ======= 934 This program is free software; you can redistribute it and/or modify 935 it under the terms of the GNU General Public License as published by 936 the Free Software Foundation; either version 2 of the License, or 937 >>>>>>> FETCH_HEAD 640 938 (at your option) any later version. 641 939 … … 646 944 647 945 You should have received a copy of the GNU General Public License 946 <<<<<<< HEAD 648 947 along with this program. If not, see <http://www.gnu.org/licenses/>. 649 948 … … 655 954 <program> Copyright (C) <year> <name of author> 656 955 This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 956 ======= 957 along with this program; if not, write to the Free Software 958 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 959 960 961 Also add information on how to contact you by electronic and paper mail. 962 963 If the program is interactive, make it output a short notice like this 964 when it starts in an interactive mode: 965 966 Gnomovision version 69, Copyright (C) year name of author 967 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 968 >>>>>>> FETCH_HEAD 657 969 This is free software, and you are welcome to redistribute it 658 970 under certain conditions; type `show c' for details. 659 971 660 972 The hypothetical commands `show w' and `show c' should show the appropriate 973 <<<<<<< HEAD 661 974 parts of the General Public License. Of course, your program's commands 662 975 might be different; for a GUI interface, you would use an "about box". … … 673 986 Public License instead of this License. But first, please read 674 987 <http://www.gnu.org/philosophy/why-not-lgpl.html>. 988 ======= 989 parts of the General Public License. Of course, the commands you use may 990 be called something other than `show w' and `show c'; they could even be 991 mouse-clicks or menu items--whatever suits your program. 992 993 You should also get your employer (if you work as a programmer) or your 994 school, if any, to sign a "copyright disclaimer" for the program, if 995 necessary. Here is a sample; alter the names: 996 997 Yoyodyne, Inc., hereby disclaims all copyright interest in the program 998 `Gnomovision' (which makes passes at compilers) written by James Hacker. 999 1000 <signature of Ty Coon>, 1 April 1989 1001 Ty Coon, President of Vice 1002 1003 This General Public License does not permit incorporating your program into 1004 proprietary programs. If your program is a subroutine library, you may 1005 consider it more useful to permit linking proprietary applications with the 1006 library. If this is what you want to do, use the GNU Library General 1007 Public License instead of this License. 1008 >>>>>>> FETCH_HEAD
Note:
See TracChangeset
for help on using the changeset viewer.
