https://github.com/ViennaRNA/ViennaRNA
Revision ec2905f4b3e5b618ecb22b627ae998ca6a8692da authored by Ronny Lorenz on 01 March 2014, 13:27:39 UTC, committed by Ronny Lorenz on 01 March 2014, 13:27:39 UTC
Conflicts:
	configure.ac
	interfaces/Perl/Makefile.am
	src/Utils/Makefile.am
	src/ViennaRNA/cofold.c
	src/ViennaRNA/data_structures.h
	src/ViennaRNA/eval.c
	src/ViennaRNA/fold_vars.c
	src/ViennaRNA/fold_vars.h
	src/ViennaRNA/loop_energies.h
	src/ViennaRNA/move_set.c
	src/ViennaRNA/part_func.c
	src/bin/RNAalifold.c

Conflictss solved! It compiles, so we ship it ;)
2 parent s deb92e7 + f2ccc48
History
Tip revision: ec2905f4b3e5b618ecb22b627ae998ca6a8692da authored by Ronny Lorenz on 01 March 2014, 13:27:39 UTC
Merge branch 'constraints_new' into development
Tip revision: ec2905f
File Mode Size
Utils
doc
interfaces
m4
man
misc
src
tests
.gitignore -rw-r--r-- 464 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-- 5.0 KB
INSTALL.configure -rw-r--r-- 7.6 KB
Makefile.am -rw-r--r-- 156 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