]> WPIA git - gigi.git/commit
Merge branch 'BenBE_work'
authorJanis Streib <janis@dogcraft.de>
Sun, 6 Jul 2014 12:06:57 +0000 (14:06 +0200)
committerJanis Streib <janis@dogcraft.de>
Sun, 6 Jul 2014 12:06:57 +0000 (14:06 +0200)
commitb2cd4d4f25d6e40e6675a455c7ed11657e1f7514
treeb9da8f6d7578768a8a2d95887541ee9f3bd8b6bc
parent40f85c683288d3b19d7ff057854df9cd7ff469c3
parent0415f01cf73d95ac60f6e025db1236c4c65f2ecc
Merge branch 'BenBE_work'

Conflicts:
natives/org_cacert_gigi_natives_SetUID.c
natives/org_cacert_gigi_natives_SetUID.c