projects
/
zefram
/
minetest
/
pipeworks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
03588a6
33e3d76
)
Merge pull request #28 from Novatux/master
author
VanessaE
<vanessaezekowitz@gmail.com>
Fri, 12 Apr 2013 18:02:02 +0000
(11:02 -0700)
committer
VanessaE
<vanessaezekowitz@gmail.com>
Fri, 12 Apr 2013 18:02:02 +0000
(11:02 -0700)
Fix conductive tube drop.
1
2
tubes.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tubes.lua
Simple merge