Review Request 121916: [Kalzium] Bug Fix 342583: Color preference changes are not reflected in the periodic table immediately

[Jeremy Whiting]

> On Jan. 11, 2015, 8:42 a.m., Etienne Rebetez wrote:
> > Ship It!
> 
> Shalin Shah wrote:
>     Thanks for giving me developer right. So I should merge my branch with master which is Applications/14.12, right? Also, can you help me out with merging patch? How should I go about it?
> 
> Jeremy Whiting wrote:
>     master branch is called "master" Applications/14.12 branch is where point releases will come from until master is branched for Applications/15.03 or whatever the next major version is going to be called.
>     
>     As for how to merge, I typically check that my local master is up to date, then rebase the branch on master, then checkout master and merge the branch. Then push to master.

Note that since this is a bugfix it should go to Applications/14.12 so it will be in the next release from that branch which will be tagged on Jan 29th. But it also needs to go to master.


- Jeremy


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/121916/#review73753
-----------------------------------------------------------


On Jan. 8, 2015, 4:38 a.m., Shalin Shah wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/121916/
> -----------------------------------------------------------
> 
> (Updated Jan. 8, 2015, 4:38 a.m.)
> 
> 
> Review request for KDE Edu and Etienne Rebetez.
> 
> 
> Repository: kalzium
> 
> 
> Description
> -------
> 
> Color of the pse elements is updated as soon as the preferences for gradient color or scheme color are changed. 
> 
> 
> Diffs
> -----
> 
>   src/kalzium.cpp 2e85cf8 
> 
> Diff: https://git.reviewboard.kde.org/r/121916/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Shalin Shah
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20150111/f3149500/attachment.html>