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