- 08 Dec, 2015 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 07 Dec, 2015 3 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
And soversion of the core library sicne there's a new virtual in it
-
Script Kiddy authored
-
- 24 Nov, 2015 1 commit
-
-
Sumit Sahrawat authored
REVIEW: 125801 BUGS: 332887
-
- 22 Nov, 2015 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 17 Nov, 2015 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-
- 15 Nov, 2015 1 commit
-
-
Oliver Sander authored
REVIEW: 126050
-
- 05 Nov, 2015 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 27 Oct, 2015 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
Instead of having to right click on it and choosing save from the menu BUGS: 354268
-
- 20 Oct, 2015 2 commits
-
-
Albert Astals Cid authored
Maybe the compiler can do it, but i can do it as well :D
-
Lauri Lyly authored
REVIEW: 125721
-
- 18 Oct, 2015 3 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 17 Oct, 2015 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
BUGS: 354016
-
- 14 Oct, 2015 2 commits
-
-
Arseniy Lartsev authored
REVIEW: 125329
-
Arseniy Lartsev authored
Presentation: correct durations for "Fade" transition effect by doing 20 FPS instead of 100 frames total Right now, fade transition is always done in 100 frames. If the intended duration is, say, 1 second, the actual duration can easily be a few seconds instead, due to the limited CPU power (on my laptop with core i5, those 100 frames take 2 seconds). I propose a patch that changes the number of frames to 20 * (duration in seconds). 20 FPS still looks completely smooth to me. REVIEW: 125310 BUGS: 352876
-
- 12 Oct, 2015 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 08 Oct, 2015 3 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
GIT_SILENT
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 26 Sep, 2015 2 commits
-
-
Arseniy Lartsev authored
REVIEW: 125341 BUGS: 353171
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 21 Sep, 2015 1 commit
-
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 17 Sep, 2015 1 commit
-
-
Yuri Chornoivan authored
-
- 16 Sep, 2015 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
Instead of many, allows for an easy fix of the case than children of root are ignored on search
-
- 15 Sep, 2015 2 commits
-
-
Albert Astals Cid authored
This way we don't need to worry if we add more widgets in the middle
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 14 Sep, 2015 1 commit
-
-
Albert Astals Cid authored
Tab replacing, function naming, include removal, @since addition, etc
-
- 13 Sep, 2015 3 commits
-
-
Albert Astals Cid authored
-
Frederic Tronel authored
BUGS: 352657
-
Script Kiddy authored
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
- 10 Sep, 2015 3 commits
-
-
Albert Astals Cid authored
we have core/version.h already Tired of updating two files
-
Albert Astals Cid authored
Conflicts: VERSION core/version.h
-
Albert Astals Cid authored
-