Public Git Hosting - minetest_hbhunger.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a72cc4d 69a9938)

commit	46965d9afef86eb60a5e97e56021c79fd75a3df6
author	Wuzzy <almikes@aol.com>
	Fri, 27 Feb 2015 06:10:18 +0000 (27 07:10 +0100)
committer	Wuzzy <almikes@aol.com>
	Fri, 27 Feb 2015 06:10:18 +0000 (27 07:10 +0100)
tree	25732c58509c659a9e6d2483ac3daf396be21e25	tree \| snapshot (tar.gz zip)
parent	a72cc4d1a7d2f4d613cbffa4ceb3974eacfc4b02	commit \| diff
parent	69a993861ef19f17626c72f6b0f9c03e137c5051	commit \| diff

Merge branch 'master' of https://github.com/BlockMen/hud

Conflicts:
README.txt

README.txt	diff1 \|	diff2 \|	blob \| history
depends.txt	diff1 \|	diff2 \|	blob \| history
hunger.lua	diff1 \|	diff2 \|	blob \| history

OLD REPO! Go to https://codeberg.org/Wuzzy/minetest_hbhunger (A Minetest mod which adds a hunger mechanic to the game.)