summaryrefslogtreecommitdiffstats
path: root/apps/wps-display.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-09-02 12:40:19 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-09-02 12:40:19 +0000
commit52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9 (patch)
treee07653a669fd5ebf2aa26b012696ad50a88e7ac7 /apps/wps-display.h
parente800bca6dca50fd3c6616cfcc3102d6cbdbec05d (diff)
downloadrockbox-52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9.tar.gz
rockbox-52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9.tar.bz2
rockbox-52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9.zip
removed the conflict markers
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2130 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps-display.h')
0 files changed, 0 insertions, 0 deletions