Merge branch 'cpplint' into world
Conflicts: src/libaevol/Dna.cpp src/libaevol/GeneticUnit.cpp src/libaevol/Stats.cpp
Showing
- src/libaevol/AeTime.cpp 7 additions, 8 deletionssrc/libaevol/AeTime.cpp
- src/libaevol/AeTime.h 12 additions, 19 deletionssrc/libaevol/AeTime.h
- src/libaevol/Alignment.cpp 132 additions, 133 deletionssrc/libaevol/Alignment.cpp
- src/libaevol/Alignment.h 55 additions, 69 deletionssrc/libaevol/Alignment.h
- src/libaevol/BoilerplateClass.cpp 1 addition, 1 deletionsrc/libaevol/BoilerplateClass.cpp
- src/libaevol/BoilerplateClass.h 4 additions, 5 deletionssrc/libaevol/BoilerplateClass.h
- src/libaevol/Codon.cpp 33 additions, 53 deletionssrc/libaevol/Codon.cpp
- src/libaevol/Codon.h 43 additions, 90 deletionssrc/libaevol/Codon.h
- src/libaevol/Deletion.cpp 24 additions, 1 deletionsrc/libaevol/Deletion.cpp
- src/libaevol/Deletion.h 33 additions, 26 deletionssrc/libaevol/Deletion.h
- src/libaevol/Dna.cpp 1171 additions, 1164 deletionssrc/libaevol/Dna.cpp
- src/libaevol/Dna.h 131 additions, 139 deletionssrc/libaevol/Dna.h
- src/libaevol/GeneticUnit.cpp 115 additions, 96 deletionssrc/libaevol/GeneticUnit.cpp
- src/libaevol/Individual.cpp 2 additions, 2 deletionssrc/libaevol/Individual.cpp
- src/libaevol/Individual_X11.cpp 3 additions, 3 deletionssrc/libaevol/Individual_X11.cpp
- src/libaevol/Metrics.h 1 addition, 1 deletionsrc/libaevol/Metrics.h
- src/libaevol/Protein.cpp 10 additions, 6 deletionssrc/libaevol/Protein.cpp
- src/libaevol/Rna.cpp 6 additions, 4 deletionssrc/libaevol/Rna.cpp
- src/libaevol/StatRecord.cpp 3 additions, 3 deletionssrc/libaevol/StatRecord.cpp
- src/libaevol/Stats.cpp 280 additions, 293 deletionssrc/libaevol/Stats.cpp
Loading
Please register or sign in to comment