Le 20 mars 2015 06:57, "Bogdan Devichev" <[email protected]> a écrit : > > hermet pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=59271716ba5443bcba215f5dfbc190fc107ae4ab > > commit 59271716ba5443bcba215f5dfbc190fc107ae4ab > Author: Bogdan Devichev <[email protected]> > Date: Fri Mar 20 14:33:23 2015 +0900 > > evas-3d: materials in .mtl format are deleted > > Summary: Materials are not used in any loader and will not be used in nearest future. > > Reviewers: raster, Hermet, cedric > > Reviewed By: cedric > > Subscribers: cedric > > Differential Revision: https://phab.enlightenment.org/D2080 > > Conflicts: > > src/examples/evas/Makefile.am
That patch was already in, you just committed the conflict :-D please revert ! > --- > src/examples/evas/Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am > index 5e27afa..5ce20ff 100644 > --- a/src/examples/evas/Makefile.am > +++ b/src/examples/evas/Makefile.am > @@ -340,6 +340,8 @@ resources/images/four_NM_height.tga \ > resources/images/rocks_NM_height.tga \ > resources/images/grid.png \ > resources/images/grid_n.png \ > +resources/models/eagle.md2 \ > +resources/models/M15.obj \ > resources/models/mesh_for_mmap.eet \ > resources/models/mesh_for_mmap.md2 \ > resources/models/mesh_for_mmap.obj \ > > -- > > > ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
