{"shas":[["9d9fae9aaa5aad7bd9df88cca22b6e945bad0d30","edba2e1d9bb1795822911dc2323c242e88363a13@gmx.de","Signed-off-by: Schneidi <schneidi-@gmx.de>","Schneidi"],["a031ad7266bd7e7f0b77f8f6f39dfa22a953e6f2","edba2e1d9bb1795822911dc2323c242e88363a13@gmx.de","Merge branch 'HEAD' of git@github.com:ZSchneidi/Projekt-42.git\n\nConflicts:\n\tsrc/core/uiobjecthandler.h\n\tsrc/elements/buttoncobject.h\n\tsrc/global_define.h\n\tsrc/view/qml_source/WebSubLayer.qml\n\tsrc/view/viewport.cpp\n\tsrc/view/webelementinterface.cpp\n\nSigned-off-by: Schneidi <schneidi-@gmx.de>","Schneidi"],["00902b3d75d7ffbffa4eb65ed6103ed1b8cef359","edba2e1d9bb1795822911dc2323c242e88363a13@gmx.de","add argument handling *NOT FINISHED*\nadd Class level comments\nupdate ButtonTObject\nupdate LogHandler\nupdate ConfigParser","Schneidi"]],"repo":"ZSchneidi/Projekt-42","actor":"ZSchneidi","ref":"refs/heads/master","size":3,"head":"00902b3d75d7ffbffa4eb65ed6103ed1b8cef359","actor_gravatar":"11725ed90a12d154a0834ea79c55084a","push_id":28720584}