diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
| commit | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (patch) | |
| tree | 6c5965b6bf1d109b853efe64777bbc7ee5548882 /src/gevent | |
| parent | c06bff3304ed234c3a7f96fd049755ac59228ef7 (diff) | |
| parent | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (diff) | |
| download | uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.gz uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.bz2 uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gevent')
| -rw-r--r-- | src/gevent/gevent_gevent.c (renamed from src/gevent/gevent.c) | 2 | ||||
| -rw-r--r-- | src/gevent/sys_make.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gevent/gevent.c b/src/gevent/gevent_gevent.c index 0a6ebcc6..fc45102e 100644 --- a/src/gevent/gevent.c +++ b/src/gevent/gevent_gevent.c @@ -6,7 +6,7 @@ */ /** - * @file src/gevent/gevent.c + * @file src/gevent/gevent_gevent.c * @brief GEVENT Driver code. * * @addtogroup GEVENT diff --git a/src/gevent/sys_make.mk b/src/gevent/sys_make.mk index 5744ae46..f8b88e56 100644 --- a/src/gevent/sys_make.mk +++ b/src/gevent/sys_make.mk @@ -1 +1 @@ -GFXSRC += $(GFXLIB)/src/gevent/gevent.c +GFXSRC += $(GFXLIB)/src/gevent/gevent_gevent.c |