Immi Halupczok twisted the bytes to say: I am forwarding this to the list, to create awareness of what we are doing.
Immi> Am 12.09.2016 um 07:28 schrieb D M German: >> Immi Halupczok twisted the bytes to say: >> >> >> Hi Immi, >> >> i have merged your kinetic scrolling to the next branch. Why don't you >> test it? Immi> Yes, I'll make that branch my "working version" of xournal (with Immi> line-widths-optimized and small-resize also merged in). We will have to keep two versions: the one that Denis can merge cleanly (based on upstream Xournal) and the one that I merge into next. The one in next is simply there and we don't have to worry about it. Denis takes his time to decide what makes it into xournal, and we want to make it as easy as possible for him. >> >> about the inability to connect the xournal/xournal repo and my repo. I >> would need to delete the current xournal repo, but that would lose the >> current forks. >> >> So what I have done is to create a new repo: xournal-dmg which is >> connected to the xournal/xournal repo (and yours) and you can send pull >> requests to it (and anybody else). Immi> Ok, good. I created pull requests for line-widths-optimized and small-resize; should I still also create one for kinetic Immi> scrolling? For kinetic scroll I will maintain now your branch and rebase it as necessary to keep it easy to merge with Denis. Did you have any merge conflicts with next for your branch of line-widths-optimized? --dmg ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. http://sdm.link/zohodev2dev _______________________________________________ Xournal-devel mailing list Xournal-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xournal-devel
