Hi,
hat schon jemand o.g. Config am Laufen und kann mir etwas unter die Arme greifen?
Ich nutze derzeit produktiv noch easyvdr 07.14.
Leider scheitere ich schon beim "beschaffen"
Code
wzVDR:/usr/src# git clone git://projects.vdr-developer.org/graphlcd-base.git -b touchcol graphlcd-base.git.touchcol
error: unknown switch `b'
Nachtrag:
Das half auch nicht:
Code
wzVDR:/usr/src# git clone git://projects.vdr-developer.org/graphlcd-base.git graphlcd-base
Initialized empty Git repository in /usr/src/graphlcd-base/.git/
remote: Counting objects: 1019, done.
remote: Compressing objects: 100% (982/982), done.
remote: Total 1019 (delta 727), reused 68 (delta 36)
Receiving objects: 100% (1019/1019), 324.74 KiB | 503 KiB/s, done.
Resolving deltas: 100% (727/727), done.
wzVDR:/usr/src# cd graphlcd-base
wzVDR:/usr/src/graphlcd-base# git pull origin touchcol
From git://projects.vdr-developer.org/graphlcd-base
* branch touchcol -> FETCH_HEAD
Auto-merged HISTORY
CONFLICT (content): Merge conflict in HISTORY
Auto-merged Make.config
Auto-merged Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merged glcddrivers/Makefile
CONFLICT (content): Merge conflict in glcddrivers/Makefile
Auto-merged glcddrivers/drivers.c
CONFLICT (content): Merge conflict in glcddrivers/drivers.c
Auto-merged glcddrivers/drivers.h
CONFLICT (content): Merge conflict in glcddrivers/drivers.h
Auto-merged glcddrivers/futabaMDM166A.c
CONFLICT (add/add): Merge conflict in glcddrivers/futabaMDM166A.c
Auto-merged glcddrivers/futabaMDM166A.h
CONFLICT (add/add): Merge conflict in glcddrivers/futabaMDM166A.h
Auto-merged glcddrivers/g15daemon.c
Auto-merged glcddrivers/gu256x64-372.c
Auto-merged glcddrivers/image.c
CONFLICT (content): Merge conflict in glcddrivers/image.c
Auto-merged glcddrivers/noritake800.c
CONFLICT (content): Merge conflict in glcddrivers/noritake800.c
Auto-merged glcddrivers/noritake800.h
CONFLICT (content): Merge conflict in glcddrivers/noritake800.h
Auto-merged glcddrivers/serdisp.c
Auto-merged glcdgraphics/Makefile
Auto-merged glcdgraphics/bitmap.c
CONFLICT (content): Merge conflict in glcdgraphics/bitmap.c
Auto-merged glcdgraphics/bitmap.h
CONFLICT (content): Merge conflict in glcdgraphics/bitmap.h
Auto-merged glcdgraphics/font.c
CONFLICT (content): Merge conflict in glcdgraphics/font.c
Auto-merged glcdgraphics/font.h
CONFLICT (content): Merge conflict in glcdgraphics/font.h
Auto-merged glcdskin/Makefile
Auto-merged glcdskin/config.h
CONFLICT (content): Merge conflict in glcdskin/config.h
Auto-merged glcdskin/display.c
CONFLICT (content): Merge conflict in glcdskin/display.c
Auto-merged glcdskin/display.h
CONFLICT (content): Merge conflict in glcdskin/display.h
Auto-merged glcdskin/object.c
CONFLICT (content): Merge conflict in glcdskin/object.c
Auto-merged glcdskin/object.h
CONFLICT (content): Merge conflict in glcdskin/object.h
Auto-merged glcdskin/parser.c
CONFLICT (content): Merge conflict in glcdskin/parser.c
Auto-merged graphlcd.conf
CONFLICT (content): Merge conflict in graphlcd.conf
Auto-merged tools/lcdtestpattern/Makefile
Auto-merged tools/showpic/showpic.c
CONFLICT (content): Merge conflict in tools/showpic/showpic.c
Auto-merged tools/showtext/showtext.c
Automatic merge failed; fix conflicts and then commit the result.
wzVDR:/usr/src/graphlcd-base#
Alles anzeigen
Nachtrag 2