search

breznak / openDS-oss

Mirror of the OpenDS.de car driving simulator
17 stars 12 forks source link

Johnny workspace #57

Closed breznak closed 8 years ago

breznak commented 8 years ago

Does this include the #48 ? Let's fix that first.

I'll help you resolve the merge confilic to master

breznak commented 8 years ago

@JohnnyMarek I merged master, fixed an error during forgotten merge. Now I have merged all of this back to Starnuti branch, so closing this in favour of #48

JohnnyMarek commented 8 years ago

I forgot to include part with the instructions. will push it with the rest later tonight :) Btw it's ok i am creating branches right? you can close them any time you feel like they are not needed anymore :)