FlightGear - Flight Simulator FGData

FlightGear Flight Simulator: free open-source multiplatform flight sim

Brought to you by: curt, jmturner, stuartbuchanan, torstendreyer

FGData Merge Request #69: Finish translation of options.xml (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

dg-505 wants to merge 0 commits from /u/dg-505/flightgear-fgdata/ to next, 2016-06-22

If this doesn't work as it should, I'll create a patch file and send it via the devel mailing-list...

Commit	Date

Discussion

James Turner - 2016-06-22

This is German translation, not Finnish :)

Joke, I will merge once the other piece is done - or maybe it already was?

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

dg-505 - 2016-06-22

:D :D

Do you mean my previous merge request with "the other piece"? I deleted the whole repo (local and on SF) and cloned a totally new one...
So maybe you can just forget the other merge request (Due to the deletion of my fork, it cannot get reyected by myself...)

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

James Turner - 2016-06-22

Merged, thank you.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

dg-505 - 2016-06-22

Great!
Thanks! :D

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.