Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Added the two most common interpolation functions
Added the UIDoubleSlider widget
Cleanup
Undoing unintended changes
Merge pull request #913 from mkienenb/PR-system-time

Non-lwjgl timer -- identical functionality to lwjgl on Mac/Linux
Merge pull request #914 from mkienenb/PR-setup-state

Simplification of StateMainMenu to be used as a base
Merge pull request #909 from mkienenb/PR-DisplayDevice

Use DisplayDevice isHeadless for registering systems
Merge pull request #906 from msteiger/math

Added the two useful interpolation functions
Merge pull request #908 from JoeClacks/develop

Adding double sliders
Tweaked cropping behaviour for LwjglCanvasRenderer, to reduce cropping state changes.
Merge branch 'nui-canvas-and-renderer' into develop
Allowing for damaging ability to specify that the dropped items should go directly into instigator's inventory.
Merge pull request #912 from MarcinSc/develop

Items and blocks can now once again be dropped directly into instigator'...
Merge branch 'PR-headless-support' into PR-headless-support-2014-02-06