projects / collection4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6132bf8 01de7d1)
Merge remote branch 'origin/master'
authorFlorian Forster <ff@octo.it>
Wed, 28 Jul 2010 08:21:05 +0000 (10:21 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 28 Jul 2010 08:21:05 +0000 (10:21 +0200)
Conflicts:
src/main.c


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