From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 25 Jun 2011 01:41:38 +0000 (+0300)
Subject: added correct data to new images, added comments in main.cpp
X-Git-Tag: 0.2.20110731_3~97
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e8a731adc502d19a8ae3bfeee5b985f90ab8a507;p=oweals%2Fminetest.git

added correct data to new images, added comments in main.cpp
---

diff --git a/data/gravel.png b/data/gravel.png
index e69de29bb..f08666ad9 100644
Binary files a/data/gravel.png and b/data/gravel.png differ
diff --git a/data/mossycobble.png b/data/mossycobble.png
index e69de29bb..fad1b33ff 100644
Binary files a/data/mossycobble.png and b/data/mossycobble.png differ
diff --git a/src/main.cpp b/src/main.cpp
index fa0439dee..41da310f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -354,6 +354,12 @@ TODO: Add a per-sector database to store surface stuff as simple flags/values
 TODO: Restart irrlicht completely when coming back to main menu from game.
 	- This gets rid of everything that is stored in irrlicht's caches.
 
+TODO: Merge bahamada's audio stuff (clean patch available)
+
+TODO: Merge spongie's chest/furnace direction (by hand)
+
+TODO: Merge key configuration menu (no clean patch available)
+
 Making it more portable:
 ------------------------