projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a12229f 805ccd4)
Merge remote-tracking branch 'upstream/master'
authorConstantin Wenger <constantin.wenger@googlemail.com>
Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)
committerConstantin Wenger <constantin.wenger@googlemail.com>
Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)

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