summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | am 9ce3bef0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-010-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-302-20/+11
| |/
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-019-3/+5
|\|
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-299-3/+5
* | Modifications for simple editnicolasroard2013-04-294-17/+47
* | am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
|\|
| * Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
| |\
| | * Cleanup crop activity UI.Ruben Brunk2013-04-262-1/+3
* | | am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-...Bobby Georgescu2013-04-261-0/+9
|\| |
| * | Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryceBobby Georgescu2013-04-261-0/+9
| |\ \
| | * | Log name of borders and filters of saved imagesBobby Georgescu2013-04-261-0/+9
* | | | am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
|\| | |
| * | | Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
| |\ \ \ | | |/ / | |/| |
| | * | Add new indicatorsMichael Kolb2013-04-26173-24/+39
| | |/
* | | am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-04-260-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2635-373/+102
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2635-373/+102
* | | | am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-04-260-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2635-614/+308
| |\ \ \ | | |_|/ | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2635-614/+308
| | |/
* | | am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" int...Doris Liu2013-04-260-0/+0
|\| |
| * | Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryceDoris Liu2013-04-265-502/+0
| |\ \ | | |/ | |/|
| | * Remove new camera activity code from BryceDoris Liu2013-04-255-502/+0
* | | am bdc9421f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-04-250-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2513-72/+205
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2513-72/+205
| | |/
* | | am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-04-250-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2512-216/+108
| |/
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-2528-489/+763
|\|
| * Merge "UI changes" into gb-ub-photos-brycenicolasroard2013-04-2527-487/+762
| |\
| | * UI changesnicolasroard2013-04-2427-487/+762
* | | am 474c2273: Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-242-0/+4
|\| |
| * | Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-242-0/+4
| |\ \
| | * | New capture animationMichael Kolb2013-04-242-0/+4
| | |/
* | | am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos...Doris Liu2013-04-241-0/+5
|\| |
| * | Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-241-0/+5
| |\ \ | | |/ | |/|
| | * Fix for popuping being hard to dismissDoris Liu2013-04-231-0/+5
* | | am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryceJohn Hoford2013-04-241-3/+30
|\| |
| * | Fix CurvesJohn Hoford2013-04-241-3/+30
* | | am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryceJohn Hoford2013-04-2414-1/+13
|\| |
| * | Merge "Fix local adjust" into gb-ub-photos-bryceJohn Hoford2013-04-2414-1/+13
| |\ \
| | * | Fix local adjustJohn Hoford2013-04-2314-1/+13
* | | | am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-04-240-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-241-6/+3
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-241-6/+3
| | |/ /
* | | | am a6e5864f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-240-0/+0
|\| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-248-29/+20
| |/ /
* | | am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryceJohn Hoford2013-04-232-0/+13
|\| |
| * | interruptible rendererJohn Hoford2013-04-232-0/+13
* | | am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryceRuben Brunk2013-04-221-0/+2
|\| |