Merge remote-tracking branch 'origin/master'

This commit is contained in:
inmarket 2013-12-29 11:40:36 +10:00
commit 1f730d474c

View file

@ -77,7 +77,7 @@ extern "C" {
* Window Manager functions * Window Manager functions
*-------------------------------------------------*/ *-------------------------------------------------*/
#if GWIN_NEED_WINDOWMANAGER #if GWIN_NEED_WINDOWMANAGER || defined(__DOXYGEN__)
// Forward definition // Forward definition
struct GWindowManager; struct GWindowManager;
@ -377,7 +377,7 @@ extern "C" {
*/ */
void gwinRedraw(GHandle gh); void gwinRedraw(GHandle gh);
#if GWIN_NEED_WINDOWMANAGER #if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__)
/** /**
* @brief Redraw a window * @brief Redraw a window
* *