Month: November 2008

176
29
Nov
2008
Posted in tech

git merge problems

When merging, ever get the error message: Error: Entry ‘foo’ is notuptodate. Cannot merge. Two possibilities: You may have local…

176
15
Nov
2008
Posted in tech

Adobe AIR 1.5 released, what changed?

Adobe AIR 1.5 has been released today for Mac OS X and Windows. Linux is still at version 1.1. So…