Archive for November, 2008

When merging, ever get the error message: Error: Entry ‘foo’ is notuptodate. Cannot merge. Two possibilities: You may have local changes that are not committed (so commit them!) or undo those changes. You may have a file that has been modified, but the contents have not been changed. ie somehow the file was ‘touch’ed. Thus git... »

Adobe AIR 1.5 has been released today for Mac OS X and Windows. Linux is still at version 1.1. So what’s changed that I can see so far? I couldn’t find any release notes (yet). For one thing, Flash Player 10 is now included. For the Mac, its at version 10,0,12,36. For Windows (XP), it’s at... »