yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #10085
Re: [Branch ~yade-pkg/yade/git-trunk] Rev 3699: Merge branch 'master' of github.com:yade/trunk
Hi,
The last "Rev..." mails are quite difficult to understand for me
- why "35 revisions removed" on 04/10 19h32 ? (whereas I still can find
on https://github.com/yade/trunk new files I added in one of these 35
removed revisions ?)
- Especially concerning this mail I answer to, I see
Le 04/10/2013 19:31, noreply@xxxxxxxxxxxxx a écrit :
Conflicts:
pkg/dem/VTKRecorder.cpp
pkg/dem/VTKRecorder.hpp
Is there really a problem ? I feared first that yes, but could not find
anything special in the code of these files ?
Follow ups
References