Changeset [4f21bb76b1fee36333a124d87de975d9f384aff7] by Michael Barton

June 24th, 2008 @ 05:26 PM

Merge branch 'master' into activerecord

Conflicts:

config/environment.rb

Conflict over activerecord and datamapper in environment.rb. Set to ActiveRecord

http://github.com/michaelbarton/...

Committed by Michael Barton

  • A model/alignment_codon.rb
  • A spec/alignment_codon.spec.rb
  • A spec/profiling/load_alignment_codon.rb
  • M .gitignore
  • M analysis/001_load_sequence_and_alignment_data/analysis.rake
  • M config/environment.rb
  • M model/alignment.rb
  • M spec/helper.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป