hollie/misterhouse — pull request #12 by hollie (2012-11-07 21:14:30+00:00)
Title: Branch merge phase1

This is the first phase of merrgin insteon and master. In this phase I bring all changes of master that are not in insteon to the insteon branch.

When this is done, bringing insteon to master should be easy (famous last words TM :-)

I encountered 2 files that did not merge automatically, and I tried to make the best of it. I did not test out the branch to see if it still runs, as I have completely no clue how to test insteon.

The offending files:
* web/bin/items.pl had edits on the same line that could not be merged automatically. I think that got merged fine manually.
* lib/xPL_Items,pl had the problem that at a point in time the line endings were changed and hence the file could not be merged automatically. I solved this by taking the master version and setting the line ending to unix again. Hope this turns out fine. By the way: git has a way to convert line endings automatically, if you don't use the regular line endings, please configure this in your git settings!