There has been a lot of good work done on Touchy recently, to make it better behaved on smaller screens (I don't blame cradle for this, I think that Gtk has changed)
I have cherry-picked a number of master commits to 2.9, and was planning to push them to 2.9 but I have hit a bit of a snag with then merging 2.9 into master (as we do). Despite merging with "-s ours" a dry-run of the push (inspected with git log -p SHA..SHA) shows changes and I don't want there to be any. I want to tell git that, at this point, 2.9 and master are synched. Any ideas? -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
