Re: [DEV] Improve locking the screen and shutting down, introduce suspend/hibernate
Rob Caelers <[email protected]> Mon, 03 Mar 2014 20:49:57 +0100
| Newsgroups | gmane.comp.misc.workrave.user |
|---|---|
| Message-ID | <[email protected]> |
Hi, On 26/02/14 20:55, Mateusz Jończyk wrote: > The pull request is here: > https://github.com/rcaelers/workrave/pull/38 I was really surprised > to see Mr Caelers merge it without any discussion. To be honest, this wasn't my intention... It seems my git was configured to push all branches, not just the current one. So I accidentally pushed your changes when I only wanted to push the 'next' branch. I decided not to revert your change because master is currently a staging branch for branch_v1_10. branch_v1_10 contains the latest stable 1.10 version. I will merge your changes into this branch when they are stable/tested. > Please note that I didn't test the code on Windows (the build > process is very tedious), but there should not be any bugs other > then trivial build errors. I fixed the trivial build errors :-) A build can be found at: http://snapshots.workrave.org/20140303/ (I haven't been able to test it yet...) Kind regards, Rob ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ Workrave-user mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/workrave-user