Make all current NOLINT strict to only the particular thing it's doing. Haven't checked if they're still required or not, but we'll see other failures on the same line now.
Resync with trunk.
Merge branch 'master' of https://code.google.com/p/open-lighting
Resync with trunk.
Merge branch 'master' of https://code.google.com/p/open-lighting
Update NEWS file
* Add a missing .h file to Makefile.am
* Make the streaming client test pass when olad is running
Merge branch 'master' of https://code.google.com/p/open-lighting
* Fix the OSCNode test so that it passes when olad is running
Minor cleanup to use make_pair rather than pair<X, Y>
* Update olad to use the new flags module
* Update README.developer
Resync with trunk.
Merge branch 'master' of https://code.google.com/p/open-lighting
Clarify which codebase, still Javascript, Python and Bash todo...
Git ignore symlinks for testing Bash completion
SPaG
update the debian changelog
* Update version number
Merge remote-tracking branch 'pn/master'
Remove some NOLINT
Fix a lint warning