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
History
File Mode Size
.gitignore -rw-r--r-- 89 bytes
2Dlandscape_mfe.gri -rwxr-xr-x 3.9 KB
2Dlandscape_pf.gri -rwxr-xr-x 3.9 KB
Makefile.am -rw-r--r-- 223 bytes
PKGBUILD.in -rw-r--r-- 950 bytes
ViennaRNA.spec.in -rw-r--r-- 2.8 KB
dna_mathews1999.par -rw-r--r-- 245.8 KB
dna_mathews2004.par -rw-r--r-- 372.2 KB
rna_andronescu2007.par -rw-r--r-- 245.3 KB
rna_turner1999.par -rw-r--r-- 245.3 KB
rna_turner2004.par -rw-r--r-- 372.7 KB

back to top