diff options
| author | Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar> | 2016-05-30 00:29:36 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar> | 2016-05-30 00:29:36 -0300 |
| commit | cf3575e0b4c5e73c6f8889bcf662906383021171 (patch) | |
| tree | a383abdd8706cb4a3d839f9a33fc0d2a7a6340f5 /platform | |
| parent | 9b1f8230ec435d9289b53afa8da02367daf8b5af (diff) | |
| parent | e6e878e139eb48f587bf4f6e111b08ebf0121749 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java/res/drawable/icon.png | bin | 12574 -> 12525 bytes |
| -rw-r--r-- | platform/windows/godot.ico | bin | 370070 -> 370070 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/platform/android/java/res/drawable/icon.png b/platform/android/java/res/drawable/icon.png Binary files differindex 013632ddf1..e334f5fa78 100644 --- a/platform/android/java/res/drawable/icon.png +++ b/platform/android/java/res/drawable/icon.png diff --git a/platform/windows/godot.ico b/platform/windows/godot.ico Binary files differindex e57ce36529..3e52f2e52f 100644 --- a/platform/windows/godot.ico +++ b/platform/windows/godot.ico |
