dblock/waffle — pull request #20 by hazendaz (2012-08-18 23:29:57+00:00)
Title: 1.5

All the initial commits here should be nothing. It took me some time to get things to rebase properly. It retained the commits I backed out from 1.5 branch. The only thing in here of note is trying to get line endings normalized. As there are now many less files due to third party stuff this is worth taking. The commit for that only included 71 file changes to which is shown here. The remainder of the items were backed out and will be added to another pull request. At the moment, everything looks ok with my local copy. I'm not sure how to make the other commits not show up. Locally, it only shows line normalization then a merge fix that resulted for the earlier items. Once the line normalization is committed, my base should be correct so that I can add the additional changes I mentioned earlier in the week. The commits here note that so you could get an early look at those even though they won't pull since I reverted them. If that doesn't appear to be the case, let me know. Maybe I should simply delete 1.5 on my end and start it over?