lobsteropteryx/g3 — pull request #1 by gypsyMoth (2014-03-12 14:20:46+00:00)
Title: My First Pull Request

I merged your changes into my working copy, with a few conflicts. All the conflicts were in the platforms/assets folder, with the exception of the Date.js file that I had messed with a little, too. Anyway, I fixed the conflicts with TortiseMerge. Successfully built app with both my changes and yours. I committed everything to the local repository, then pushed my local repository up to my GitHub fork... Now you need to pull the changes in to yours? Let me know how it goes...