summaryrefslogtreecommitdiffhomepage
path: root/main.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-09-22 19:38:39 +0200
committerAki <nthirtyone@gmail.com>2017-09-22 19:38:39 +0200
commit6d530ace4d6a445d3136cca180f54f8add3d81fc (patch)
tree0dd6d7b0ffe24a8f9962d71ef6c3bfc572871ce1 /main.lua
parentc4524ee39e0ff90bde0df0ce7a0c14f74eeb152f (diff)
parenteabad160152f5bf6e7dd442de46b135a1a59f75e (diff)
downloadroflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.zip
roflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.tar.gz
roflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.tar.bz2
Merge branch 'icons'
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/main.lua b/main.lua
index a71b9e2..ec56e4c 100644
--- a/main.lua
+++ b/main.lua
@@ -16,7 +16,6 @@ musicPlayer = require "not.MusicPlayer"()
sceneManager = require "not.SceneManager"()
-- Require
-require "iconsList"
require "not.World"
require "not.Camera"
require "not.Menu"