https://github.com/ViennaRNA/ViennaRNA
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
Tip revision: 0b45f435d9fb0332e8601adc9360de711cdb319b authored by Ronny Lorenz on 11 May 2015, 09:20:33 UTC
Merge branch 'development' for v2.2.0-RC3
Tip revision: 0b45f43
File Mode Size
doc
examples
interfaces
m4
man
misc
src
tests
.gitignore -rw-r--r-- 378 bytes
.gitmodules -rw-r--r-- 204 bytes
.local -rw-r--r-- 0 bytes
AUTHORS -rw-r--r-- 371 bytes
COPYING -rw-r--r-- 859 bytes
ChangeLog -rw-r--r-- 8.8 KB
INSTALL -rw-r--r-- 4.8 KB
INSTALL.configure -rw-r--r-- 7.6 KB
Makefile.am -rw-r--r-- 225 bytes
NEWS -rw-r--r-- 6.7 KB
README -rw-r--r-- 5.3 KB
RNAlib2.pc.in -rw-r--r-- 279 bytes
THANKS -rw-r--r-- 385 bytes
acinclude.m4 -rw-r--r-- 377 bytes
autogen.sh -rwxr-xr-x 1.1 KB
configure.ac -rw-r--r-- 1.9 KB
licence.txt -rw-r--r-- 707 bytes
make_windows_installer.sh -rwxr-xr-x 2.3 KB
win_installer_archlinux_i486.nsi -rw-r--r-- 6.1 KB
win_installer_archlinux_i686.nsi -rw-r--r-- 6.0 KB
win_installer_archlinux_x86_64.nsi -rw-r--r-- 6.0 KB
win_installer_fedora_i686.nsi -rw-r--r-- 6.2 KB
win_installer_fedora_x86_64.nsi -rw-r--r-- 6.2 KB

README

back to top