beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
from __future__ import absolute_import
from etherlab.etherlab import *
from util.BitmapLibrary import AddBitmapFolder
import util.paths as paths
AddBitmapFolder(os.path.join(paths.AbsDir(__file__), "images"))