noget der virker
prototype01 version
Merge branch 'prototype01' into start_up_screen
newest version of startupscreen
added gridview content
modifiede start up screen code.
needed to commit before merge
Merge branch 'menu_layouts' into start_up_screen
Merge branch 'menu_layouts' into start_up_screen
fixed some merge conflicts
Merge branch 'start_up_screen' of https://github.com/NC2903/Tortoise into start_up_screen
Merge branch 'menu_layouts' into start_up_screen
IP Adresses in gitmodules
Merge remote-tracking branch 'origin/start_up_screen' into prototype01
Properties
Persistent lifestories
Merge conflict solved