Skip to content

Commit 629da71

Browse files
committed
fix conflict
2 parents f78a3e5 + 8397636 commit 629da71

42 files changed

Lines changed: 37662 additions & 488 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

a

Lines changed: 0 additions & 24 deletions
This file was deleted.

assets/sound/ambient2.wav

3.94 MB
Binary file not shown.

assets/texture/bg1.xpm

Lines changed: 1050 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/bg2.xpm

Lines changed: 1050 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/bg3.xpm

Lines changed: 1047 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/bg4.xpm

Lines changed: 1050 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/cube1.xpm

Lines changed: 1067 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/cube2.xpm

Lines changed: 1067 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/cube3.xpm

Lines changed: 1067 additions & 0 deletions
Large diffs are not rendered by default.

assets/texture/cube4.xpm

Lines changed: 1067 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)