projects / projects / chimara / chimara.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e1eb25 c9cb272)
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Tue, 28 Aug 2012 08:57:54 +0000 (10:57 +0200)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Tue, 28 Aug 2012 08:57:54 +0000 (10:57 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.