diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 16:17:17 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 16:17:17 +0000 |
commit | 9cf09f33aa19762fcacc99062d7b6aed1ce969e1 (patch) | |
tree | e4e7c2ab9055e752d71f2b03f074aaf4e14b592e /apps/gui/skin_engine/skin_parser.c | |
parent | 9ac4b446106f733dc1c4be69d97acbcc4c44d9ad (diff) | |
download | rockbox-9cf09f33aa19762fcacc99062d7b6aed1ce969e1.tar.gz rockbox-9cf09f33aa19762fcacc99062d7b6aed1ce969e1.zip |
crappy editor and crappy svn missing crappy merge crappy crappy 2am crappy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26728 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 561eb978a2..a2c4c6acc5 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1248,12 +1248,8 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1248 | PB_X = 0, | 1248 | PB_X = 0, |
1249 | PB_Y, | 1249 | PB_Y, |
1250 | PB_WIDTH, | 1250 | PB_WIDTH, |
1251 | <<<<<<< .mine | ||
1252 | PB_HEIGHT, | 1251 | PB_HEIGHT, |
1253 | PB_FILENAME, | 1252 | PB_FILENAME, |
1254 | ======= | ||
1255 | PB_HEIGHT, | ||
1256 | >>>>>>> .r26726 | ||
1257 | }; | 1253 | }; |
1258 | const char *filename; | 1254 | const char *filename; |
1259 | int x, y, height, width; | 1255 | int x, y, height, width; |