Revision 0b45f435d9fb0332e8601adc9360de711cdb319b authored by Ronny Lorenz on 11 May 2015, 09:20:33 UTC, committed by Ronny Lorenz on 11 May 2015, 09:20:33 UTC
Conflicts:
	interfaces/Python/setup.py.in
	src/ViennaRNA/cofold.c
	src/ViennaRNA/data_structures.c
	src/ViennaRNA/data_structures.h
	src/ViennaRNA/fold.c
	src/ViennaRNA/fold.h
	src/ViennaRNA/multibranch_loops.h
	src/ViennaRNA/part_func.c
	src/ViennaRNA/part_func.h
	src/ViennaRNA/part_func_co.c
	src/ViennaRNA/part_func_co.h
	src/ViennaRNA/perturbation_fold.c
	src/ViennaRNA/subopt.c
	src/bin/RNA2Dfold.c
	src/bin/RNAalifold.c
	src/bin/RNAcofold.c
	src/bin/RNAfold.c
	src/bin/RNApvmin.c
	src/bin/RNAsubopt.c
	src/bin/RNAsubopt.ggo

All conflicts resolved and bump to v2.2.0-RC3
2 parent s b7822a1 + e4bc14c
Raw File
licence.txt
			 Disclaimer and Copyright

The programs, library and source code of the Vienna RNA Package are free
software. They are distributed in the hope that they will be useful
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  

Permission is granted for research, educational, and commercial use
and modification so long as 1) the package and any derived works are not
redistributed for any fee, other than media costs, 2) proper credit is
given to the authors and the Institute for Theoretical Chemistry of the 
University of Vienna.

If you want to include this software in a commercial product, please contact 
the authors. 

back to top