Re: [ros-dev] Re: [ros-svn] [hbirr] 15352:

[Hartmut Birr]

Thomas Weidenmueller wrote:

>  hbirr(a)svn.reactos.com wrote:
>   
>
> >  Deleted files:
> > branches/cache_manager_rewrite/reactos/lib/msgina/
> >     
> >  
> Just out of curiosity, what's that deleting+adding for?
>
> Best Regards,
> Thomas
> _______________________________________________
> Ros-dev mailing list
> Ros-dev(a)reactos.com
> http://reactos.com:8080/mailman/listinfo/ros-dev
>
>
>   
>  
Someone has deleted the makefile and added it again as Makefile in a
single commit. I couln't solve this problem with the merge command.

- Hartmut