Git Merge Request #2: Merge upstream changes (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Steven Blackburn wants to merge 2 commits from /u/beeka/minidlna/ to master, 2014-03-06

Commit Date  
[ef9d41] by Steve Blackburn Steve Blackburn

Fixed compliation error regarding use of inlines. Problem showed itself on Mac OS X Mavericks.

2014-03-02 12:07:43 Tree
[8959c0] by Steve Blackburn Steve Blackburn

Addressed compilation warning on Mac OS X Mavericks.

2014-03-02 12:05:41 Tree

Discussion

  • Steven Blackburn

    please delete this.... sf.net not making it clear how to get the latest root changes into my fork. :-(

     
  • Justin Maggard

    Justin Maggard - 2014-03-06
    • Status: open --> rejected
     
  • Justin Maggard

    Justin Maggard - 2014-03-06

    Rejected per request.

     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks