Permalink
Failed to load latest commit information.
Type
Name
Latest commit message
Commit time
.settings
Merger changes
May 17, 2018 14:42
bin
changed how solved conflicts are counted
May 29, 2018 23:27
build
new eval result
May 30, 2018 18:37
conflicts/test
conflicting moves favor new parents
May 18, 2018 14:17
gradle/wrapper
added gradle and other stuff, will clean up soon
April 26, 2018 14:20
reports
added final report to w11
June 7, 2018 17:40
resources
Added architecture.png
May 30, 2018 12:21
scripts
Update README.md
June 1, 2018 18:37
src
added documentation
May 31, 2018 13:48
tmp
changed how solved conflicts are counted
May 29, 2018 23:27
.gitignore
update .gitignore
May 17, 2018 12:42
.travis.yml
updated gradlew permissions
April 26, 2018 18:08
README.md
Update README.md
May 18, 2018 14:00
build.gradle
fixed typo*
May 12, 2018 22:30
design_decisions.txt
conflicting moves favor new parents
May 18, 2018 14:17
gradlew
updated gradlew permissions
April 26, 2018 18:08
report.pdf
added report revision
April 26, 2018 22:48