Merge commit 'refs/merge-requests/6' of git://gitorious.org/minetest-classic/minetest-classic into merge-requests/6

2014-01-22 12:12:38 +10:00 · 2014-01-22 12:12:38 +10:00 · 7e9b537336
parent f0cf35c939 29bcd1ce7e
commit 7e9b537336
158 changed files with 0 additions and 0 deletions
--- a/data/textures/apple.png
+++ b/data/textures/apple.png
--- a/data/textures/apple_blossom.png
+++ b/data/textures/apple_blossom.png
--- a/data/textures/apple_iron.png
+++ b/data/textures/apple_iron.png
--- a/data/textures/apple_leaves.png
+++ b/data/textures/apple_leaves.png
--- a/data/textures/apple_tree.png
+++ b/data/textures/apple_tree.png
--- a/data/textures/apple_tree_top.png
+++ b/data/textures/apple_tree_top.png
--- a/data/textures/ash.png
+++ b/data/textures/ash.png
--- a/data/textures/book.png
+++ b/data/textures/book.png
--- a/data/textures/bookshelf.png
+++ b/data/textures/bookshelf.png
--- a/data/textures/borderstone.png
+++ b/data/textures/borderstone.png
--- a/data/textures/brick.png
+++ b/data/textures/brick.png
--- a/data/textures/cactus_side.png
+++ b/data/textures/cactus_side.png
--- a/data/textures/cactus_top.png
+++ b/data/textures/cactus_top.png
--- a/data/textures/chest_front.png
+++ b/data/textures/chest_front.png
--- a/data/textures/chest_lock.png
+++ b/data/textures/chest_lock.png
--- a/data/textures/chest_side.png
+++ b/data/textures/chest_side.png
--- a/data/textures/chest_top.png
+++ b/data/textures/chest_top.png
--- a/data/textures/clay.png
+++ b/data/textures/clay.png
--- a/data/textures/clay_black.png
+++ b/data/textures/clay_black.png
--- a/data/textures/clay_blue.png
+++ b/data/textures/clay_blue.png
--- a/data/textures/clay_brick.png
+++ b/data/textures/clay_brick.png
--- a/data/textures/clay_green.png
+++ b/data/textures/clay_green.png
--- a/data/textures/clay_orange.png
+++ b/data/textures/clay_orange.png
--- a/data/textures/clay_purple.png
+++ b/data/textures/clay_purple.png
--- a/data/textures/clay_red.png
+++ b/data/textures/clay_red.png
--- a/data/textures/cloud.png
+++ b/data/textures/cloud.png
--- a/data/textures/cobble.png
+++ b/data/textures/cobble.png
--- a/data/textures/cobble_wall_inv.png
+++ b/data/textures/cobble_wall_inv.png
--- a/data/textures/conifer_leaves.png
+++ b/data/textures/conifer_leaves.png
--- a/data/textures/conifer_tree.png
+++ b/data/textures/conifer_tree.png
--- a/data/textures/conifer_tree_top.png
+++ b/data/textures/conifer_tree_top.png
--- a/data/textures/cooked_rat.png
+++ b/data/textures/cooked_rat.png
--- a/data/textures/cotton.png
+++ b/data/textures/cotton.png
--- a/data/textures/cotton_black.png
+++ b/data/textures/cotton_black.png
--- a/data/textures/cotton_blue.png
+++ b/data/textures/cotton_blue.png
--- a/data/textures/cotton_green.png
+++ b/data/textures/cotton_green.png
--- a/data/textures/cotton_orange.png
+++ b/data/textures/cotton_orange.png
--- a/data/textures/cotton_purple.png
+++ b/data/textures/cotton_purple.png
--- a/data/textures/cotton_red.png
+++ b/data/textures/cotton_red.png
--- a/data/textures/cotton_yellow.png
+++ b/data/textures/cotton_yellow.png
--- a/data/textures/deadgrass.png
+++ b/data/textures/deadgrass.png
--- a/data/textures/dirt.png
+++ b/data/textures/dirt.png
--- a/data/textures/door_glass_b.png
+++ b/data/textures/door_glass_b.png
--- a/data/textures/door_glass_inv.png
+++ b/data/textures/door_glass_inv.png
--- a/data/textures/door_glass_t.png
+++ b/data/textures/door_glass_t.png
--- a/data/textures/door_steel_b.png
+++ b/data/textures/door_steel_b.png
--- a/data/textures/door_steel_t.png
+++ b/data/textures/door_steel_t.png
--- a/data/textures/door_steel_w_inv.png
+++ b/data/textures/door_steel_w_inv.png
--- a/data/textures/door_steel_wb.png
+++ b/data/textures/door_steel_wb.png
--- a/data/textures/door_steel_wt.png
+++ b/data/textures/door_steel_wt.png
--- a/data/textures/door_wood_b.png
+++ b/data/textures/door_wood_b.png
--- a/data/textures/door_wood_inv.png
+++ b/data/textures/door_wood_inv.png
--- a/data/textures/door_wood_t.png
+++ b/data/textures/door_wood_t.png
--- a/data/textures/door_wood_w_inv.png
+++ b/data/textures/door_wood_w_inv.png
--- a/data/textures/door_wood_wb.png
+++ b/data/textures/door_wood_wb.png
--- a/data/textures/door_wood_wt.png
+++ b/data/textures/door_wood_wt.png
--- a/data/textures/flower_daffodil.png
+++ b/data/textures/flower_daffodil.png
--- a/data/textures/flower_pot.png
+++ b/data/textures/flower_pot.png
--- a/data/textures/flower_pot_bottom.png
+++ b/data/textures/flower_pot_bottom.png
--- a/data/textures/flower_pot_raw.png
+++ b/data/textures/flower_pot_raw.png
--- a/data/textures/flower_pot_raw_bottom.png
+++ b/data/textures/flower_pot_raw_bottom.png
--- a/data/textures/flower_pot_raw_top.png
+++ b/data/textures/flower_pot_raw_top.png
--- a/data/textures/flower_pot_top.png
+++ b/data/textures/flower_pot_top.png
--- a/data/textures/flower_rose.png
+++ b/data/textures/flower_rose.png
--- a/data/textures/flower_stem.png
+++ b/data/textures/flower_stem.png
--- a/data/textures/flower_tulip.png
+++ b/data/textures/flower_tulip.png
--- a/data/textures/gate_steel.png
+++ b/data/textures/gate_steel.png
--- a/data/textures/gate_steel_inv.png
+++ b/data/textures/gate_steel_inv.png
--- a/data/textures/gate_wood.png
+++ b/data/textures/gate_wood.png
--- a/data/textures/gate_wood_inv.png
+++ b/data/textures/gate_wood_inv.png
--- a/data/textures/glass.png
+++ b/data/textures/glass.png
--- a/data/textures/glass_black.png
+++ b/data/textures/glass_black.png
--- a/data/textures/glass_blue.png
+++ b/data/textures/glass_blue.png
--- a/data/textures/glass_green.png
+++ b/data/textures/glass_green.png
--- a/data/textures/glass_orange.png
+++ b/data/textures/glass_orange.png
--- a/data/textures/glass_pane_black_side.png
+++ b/data/textures/glass_pane_black_side.png
--- a/data/textures/glass_pane_blue_side.png
+++ b/data/textures/glass_pane_blue_side.png
--- a/data/textures/glass_pane_green_side.png
+++ b/data/textures/glass_pane_green_side.png
--- a/data/textures/glass_pane_orange_side.png
+++ b/data/textures/glass_pane_orange_side.png
--- a/data/textures/glass_pane_purple_side.png
+++ b/data/textures/glass_pane_purple_side.png
--- a/data/textures/glass_pane_red_side.png
+++ b/data/textures/glass_pane_red_side.png
--- a/data/textures/glass_pane_side.png
+++ b/data/textures/glass_pane_side.png
--- a/data/textures/glass_pane_yellow_side.png
+++ b/data/textures/glass_pane_yellow_side.png
--- a/data/textures/glass_purple.png
+++ b/data/textures/glass_purple.png
--- a/data/textures/glass_red.png
+++ b/data/textures/glass_red.png
--- a/data/textures/glass_yellow.png
+++ b/data/textures/glass_yellow.png
--- a/data/textures/glasslight.png
+++ b/data/textures/glasslight.png
--- a/data/textures/grass.png
+++ b/data/textures/grass.png
--- a/data/textures/grass_footsteps.png
+++ b/data/textures/grass_footsteps.png
--- a/data/textures/grass_side.png
+++ b/data/textures/grass_side.png
--- a/data/textures/gravel.png
+++ b/data/textures/gravel.png
--- a/data/textures/hatch_steel.png
+++ b/data/textures/hatch_steel.png
--- a/data/textures/hatch_steel_inv.png
+++ b/data/textures/hatch_steel_inv.png
--- a/data/textures/hatch_steel_w.png
+++ b/data/textures/hatch_steel_w.png
--- a/data/textures/hatch_steel_w_inv.png
+++ b/data/textures/hatch_steel_w_inv.png
--- a/data/textures/hatch_wood.png
+++ b/data/textures/hatch_wood.png
--- a/data/textures/hatch_wood_inv.png
+++ b/data/textures/hatch_wood_inv.png
--- a/data/textures/hatch_wood_w.png
+++ b/data/textures/hatch_wood_w.png
--- a/data/textures/hatch_wood_w_inv.png
+++ b/data/textures/hatch_wood_w_inv.png
--- a/data/textures/heart.png
+++ b/data/textures/heart.png
--- a/Show More
+++ b/Show More