Re: Force push to plasma-framework

2013-08-31 Thread Ben Cooksley
On Sun, Sep 1, 2013 at 3:38 AM, Ivan Čukić wrote: > On Sunday 01 September 2013 01:03:59 Ben Cooksley wrote: >> Hi everyone, >> >> Due to an unfortunate accident involving git merge, several branches >> of the plasma-framework repository were rendered unusable. >> >> To correct this, two branches

Re: Force push to plasma-framework

2013-08-31 Thread Ivan Čukić
On Sunday 01 September 2013 01:03:59 Ben Cooksley wrote: > Hi everyone, > > Due to an unfortunate accident involving git merge, several branches > of the plasma-framework repository were rendered unusable. > > To correct this, two branches have been forcibly rewound. They are: > - master: now at

Force push to plasma-framework

2013-08-31 Thread Ben Cooksley
Hi everyone, Due to an unfortunate accident involving git merge, several branches of the plasma-framework repository were rendered unusable. To correct this, two branches have been forcibly rewound. They are: - master: now at ea1b637 - ivan/shell-switching: now at f8c2ff5. The following commits