Sander Mathijs van Veen 388bdb396f Fix merge conflict. 13 lat temu
..
cross.png 388bdb396f Fix merge conflict. 13 lat temu
info.png 388bdb396f Fix merge conflict. 13 lat temu
load.gif 388bdb396f Fix merge conflict. 13 lat temu
tick.png 388bdb396f Fix merge conflict. 13 lat temu