Resync 0.10 into master #1058
Merged
Resync 0.10 into master #1058
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the Stellascapes Number1 PIDs
Now a simple noscript tag will inform the user why the olad web interface is not working, and how to remedy the situation.
The old cppunit macro AM_PATH_CPPUNIT still used cppunit-config which has been deprecated since pkgconfig came along. The cppunit macro has been removed and the check now uses PKG_CHECK_MODULES instead. Signed-off-by: Dave Olsthoorn <[email protected]> (cherry picked from commit 16c67fe)
Forgot to remove the makefile reference to config/cppunit.m4 in the top level Makefile.am Signed-off-by: Dave Olsthoorn <[email protected]> (cherry picked from commit af81a99)
Since both Peter and I thought about wording it that way, I have made it so.
Backport using pkg-config for cppunit into 0.10
…ript-help-to-0-10 Add warning if JavaScript is off, OpenLightingProject#1046
Correct the reported min and max for DMX start address via the JSON API
…0.10.1 Resync 0.10.1 into 0.10
Resync to OLA 0.10
Get Travis building on OS X
Member
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.