Kalle Bladin 012bcaefaf Solve merge conflicts.

2016-06-07 12:54:52 -04:00

..

gui.cpp

Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95)

2016-06-02 13:12:28 +02:00

guicomponent.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

guihelpcomponent.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

guiiswacomponent.cpp

Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop

2016-06-04 19:06:54 +02:00

guiorigincomponent.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

guiperformancecomponent.cpp

Make performance widget graphs fill from right to left instead of circular

2016-06-07 11:16:27 +02:00

guipropertycomponent.cpp

Histogram eq with group dataprocessor

2016-05-20 16:46:33 -04:00

guitimecomponent.cpp

Increase value range of delta time in GUI

2016-06-01 20:53:51 -04:00

renderproperties.cpp

Solved GUI name conflict

2016-05-26 10:05:18 -04:00