diff options
author | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:03 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:03 +0100 |
commit | 9dfa8da709a1589d177d99c597d9b18d8c9a145d (patch) | |
tree | e5f42ab6c6bcfffd17eb60306ffad2c0567dac6f /include/.gitignore | |
parent | 0c2dd9a05bdcf3b2b4880509ec690116873fe158 (diff) | |
parent | a2a5729fc1247bb45d794e9d731c0b03bf58096f (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video:
api: export LCD device to external apps
font: split font data from video_font.h
tools: logo: split bmp arrays from bmp_logo.h
lcd: add clear and draw bitmap declaration
VIDEO: mx3fb: GCC4.6 fix build warnings
Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
Diffstat (limited to 'include/.gitignore')
-rw-r--r-- | include/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/.gitignore b/include/.gitignore index ec224c545c5..7cd3e907002 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,5 +1,6 @@ /autoconf.mk* /asm /bmp_logo.h +/bmp_logo_data.h /config.h /config.mk |