On Mon, Oct 17, 2011 at 06:01:56PM +0200, Dieter Mummenschanz wrote: > Hi Daniel, > > ok I did a git clone git://anongit.freedesktop.org/libva (hope this is the > right one?) and in the libva checkout I issued: > > git pull git://freedesktop.org/~danvet/libva-intel for-dieter > warning: no common commits > remote: Counting objects: 1632, done. > remote: Compressing objects: 100% (447/447), done. > remote: Total 1632 (delta 1174), reused 1632 (delta 1174) > Receiving objects: 100% (1632/1632), 617.29 KiB | 230 KiB/s, done. > Resolving deltas: 100% (1174/1174), done. > From git://freedesktop.org/~danvet/libva-intel > * branch for-dieter -> FETCH_HEAD > Auto-merging configure.ac > CONFLICT (add/add): Merge conflict in configure.ac > Auto-merging Makefile.am > CONFLICT (add/add): Merge conflict in Makefile.am > Auto-merging .gitignore > CONFLICT (add/add): Merge conflict in .gitignore > Automatic merge failed; fix conflicts and then commit the result. > > help! :-(
Ok, I've given that git repo a head, so your usual git clone should work. Btw, you're sure you have the latest libva? It moved to http://cgit.freedesktop.org/vaapi/intel-driver/ Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
