search

JoSchaap / GoT_Wasteland_V2.Stratis

WARNING! This repo is no longer updated, find the updated version on the A3Wasteland git! -
http://www.a3wasteland.com
11 stars 20 forks source link

Antihack update #30

Closed k4n30 closed 11 years ago

k4n30 commented 11 years ago

updates from AgentRev

AgentRev commented 11 years ago

Wait a second... You forked his master, which has the anti-hack from my revision D2, then you overwrote it with an older version from my revision D1, and now you're trying to merge it back into his master while he's working on the beta branch? Way to go lol

k4n30 commented 11 years ago

Sorry man, thought it was updated :( didn't realise it was an old one

JoSchaap commented 11 years ago

any input is appreciated, even if it turns out to be updated ;)