Maya

Merge lp://staging/~kjtehprogrammer/maya/fix-1300569 into lp://staging/~elementary-apps/maya/trunk

  1. fix-1300569
  2. Merge into trunk
Proposed by KJ Lawrence
Status: Merged
Merged at revision: 545
Proposed branch: lp://staging/~kjtehprogrammer/maya/fix-1300569
Merge into: lp://staging/~elementary-apps/maya/trunk
Diff against target: 30 lines (+2/-7)
2 files modified
src/Application.vala (+1/-6)
src/View/MayaToolbar.vala (+1/-1)
To merge this branch: bzr merge lp://staging/~kjtehprogrammer/maya/fix-1300569
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
Corentin Noël Needs Fixing
Review via email: mp+213966@code.staging.launchpad.net

Commit message

Fixes today not selecting the right day.

Description of the change

Fixes "Today" action

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

You indeed have fixed the bug, great !
Please remove the lines 9, 10 and 11 from diffs as the today variable is no more used.

review: Needs Fixing
Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

Gone!

Revision history for this message
RabbitBot (rabbitbot-a) wrote :

Attempt to merge into lp:maya failed due to conflicts:

text conflict in src/Application.vala
text conflict in src/View/MayaToolbar.vala

Revision history for this message
Cody Garver (codygarver) wrote :

You need to bzr merge lp:maya, then resolve conflicts, make sure it compiles, and push the updated code to this branch. Comment when it's ready

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches