projects / projects / chimara / chimara.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d900ed4 8908178)
Merge branch 'master' of https://github.com/wmvanvliet/Chimara
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 29 Jan 2011 13:46:04 +0000 (14:46 +0100)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 29 Jan 2011 13:46:04 +0000 (14:46 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.