Illuna-Minetest/minetest_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve mergeconflicts

Browse Source
This commit is contained in:
Milan 2018-09-28 12:20:44 +02:00
commit 2ad3c3e5f5
8 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
menu/header.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
menu/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 12 KiB

2
mods/illuna

@ -1 +1 @@
Subproject commit e64b1211ccfc2b14a75d53679eaaf71829aef180
Subproject commit 77626c2f7542c3f44071cc3c94178d1a84e55475

2
mods/mesecons

@ -1 +1 @@
Subproject commit 7b2456177bda55daffb639aece304315fcf367ad
Subproject commit 93eed228bc92a9dbb14903674e1f07acfa5c9510

2
mods/pipeworks

@ -1 +1 @@
Subproject commit f9f436fd7e789a513288a298123f34b7cfd03504
Subproject commit cb5530c6c82a4e3409780d93d513dd32c68c4dec

2
mods/playereffects

@ -1 +1 @@
Subproject commit f0f6fa4183915310e9553fa47a937d9da81f175c
Subproject commit 535cf87dc70627435d8802b2adad8aa040ebdd43

2
mods/protector

@ -1 +1 @@
Subproject commit 8097aa4afeb56aa4eb680223456a9b59c7db0ca1
Subproject commit f8297f0520aa524e7505fb018989eb2f311f91e3

2
mods/wine

@ -1 +1 @@
Subproject commit 769f2bb6e8f32880f5d044ad70f8b8fba8a85ff4
Subproject commit 5ca1bd332bee644f8098a581b8c63c08d30c9afc