Commits · 209e4fccb5b63f1692694fc711eeda43edf9d435 · Multimedia / Kdenlive

17 Apr, 2017 2 commits
- Merge branch '17.04' · 209e4fcc
  Jean-Baptiste Mardelle authored Apr 17, 2017
  
  209e4fcc
- Fixed off-by-one errors in fft-based cross-correlation computations · 3404da90
  Jean-Baptiste Mardelle authored Apr 17, 2017
```
Patch by raphaelm
Differential Revision: https://phabricator.kde.org/D5454
```
  3404da90
16 Apr, 2017 5 commits
- Don't show color theme configuration option unavailable on Windows · 414d6579
  Vincent Pinon authored Apr 16, 2017
```
BUG: 375723
```
  414d6579
- Fix temp path on Windows · 673d0f79
  Vincent Pinon authored Apr 16, 2017
```
BUG: 375717
```
  673d0f79
- Fix MLT doc link · 7cf9980c
  Vincent Pinon authored Apr 16, 2017
```
BUG: 375316
```
  7cf9980c
- SVN_SILENT made messages (.desktop file) - always resolve ours · e8d6b75c
  Script Kiddy authored Apr 16, 2017
```
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"
```
  e8d6b75c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9f01d936
  Script Kiddy authored Apr 16, 2017
```
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"
```
  9f01d936
15 Apr, 2017 1 commit
- Fix script export & QScript header left · 984df727
  Vincent Pinon authored Apr 10, 2017
  
  984df727
13 Apr, 2017 1 commit
- Fix glitch on pause and does not play last second of project · 6f5584ee
  Jean-Baptiste Mardelle authored Apr 13, 2017
```
BUG: 371762
```
  6f5584ee
12 Apr, 2017 1 commit
- GIT_SILENT Upgrade KDE Applications version to 17.04.0. · 74a0be8d
  Albert Astals Cid authored Apr 12, 2017
  
  74a0be8d
08 Apr, 2017 2 commits
- remove QScript dependency · c92aa046
  Vincent Pinon authored Mar 31, 2017
  
  c92aa046
- Fix render scripts on Windows: generate .bat files · 42a40132
  Vincent Pinon authored Apr 07, 2017
  
  42a40132
05 Apr, 2017 3 commits
- GIT_SILENT Upgrade KDE Applications version to 17.03.90. · b09224ee
  Albert Astals Cid authored Apr 05, 2017
  
  b09224ee
- Merge branch 'master' of git://anongit.kde.org/kdenlive · 4724bb8b
  Laurent Montel authored Apr 05, 2017
  
  4724bb8b
- Port some foreach to c++ for(...:...) · d33d59c2
  Laurent Montel authored Apr 05, 2017
  
  d33d59c2
04 Apr, 2017 1 commit
- Fix compiler settings for Clang · 8ec829f1
  Kevin Funk authored Apr 04, 2017
  
  8ec829f1
03 Apr, 2017 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 80e0b44f

Script Kiddy authored Apr 03, 2017

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"

80e0b44f

SVN_SILENT made messages (.desktop file) - always resolve ours · e4e82075

Script Kiddy authored Apr 03, 2017

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"

e4e82075

28 Mar, 2017 2 commits
- Merge branch '17.04' · 020eb7be
  Jean-Baptiste Mardelle authored Mar 28, 2017
  
  020eb7be
- Fix possible crash on rendering with "play after render" option · cb89fe49
  Jean-Baptiste Mardelle authored Mar 28, 2017
  
  cb89fe49
27 Mar, 2017 3 commits
- Merge branch 'Applications/17.04' · 388d9833
  Vincent Pinon authored Mar 28, 2017
  
  388d9833
- Images also use qimage producer · 47858957
  Vincent Pinon authored Mar 27, 2017
  
  47858957
- fix Windows build with C++ threads · 6766aec2
  Vincent Pinon authored Mar 27, 2017
  
  6766aec2
26 Mar, 2017 3 commits
- Fix some effects incorrectly initialized on tracks · 3e5598b2
  Jean-Baptiste Mardelle authored Mar 26, 2017
```
BUG: 378071
```
  3e5598b2
- SVN_SILENT made messages (.desktop file) - always resolve ours · b1c5738a
  Script Kiddy authored Mar 26, 2017
```
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"
```
  b1c5738a
- SVN_SILENT made messages (.desktop file) - always resolve ours · 79a0a889
  Script Kiddy authored Mar 26, 2017
```
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"
```
  79a0a889
25 Mar, 2017 4 commits
- Remove beta message in preparation of release · 359220c9
  Jean-Baptiste Mardelle authored Mar 25, 2017
  
  359220c9
- Fix locked ratio scaling · a2b2d505
  Jean-Baptiste Mardelle authored Mar 25, 2017
  
  a2b2d505
- SVN_SILENT made messages (.desktop file) - always resolve ours · 66cfda93
  Script Kiddy authored Mar 25, 2017
```
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"
```
  66cfda93
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7c237457
  Script Kiddy authored Mar 25, 2017
```
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"
```
  7c237457
24 Mar, 2017 3 commits
- Merge branch '17.04' · df840cdf
  Jean-Baptiste Mardelle authored Mar 24, 2017
  
  df840cdf
- Fix archived project wrong path and missing images/slideshows · d961c39b
  Jean-Baptiste Mardelle authored Mar 24, 2017
```
CCBUG: 377999
CCBUG: 378000
```
  d961c39b
- More clever ratio locking in effect/transition · f99275fa
  Jean-Baptiste Mardelle authored Mar 24, 2017
  
  f99275fa
23 Mar, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b279de93

Script Kiddy authored Mar 23, 2017

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"

b279de93

22 Mar, 2017 2 commits
- Merge branch '17.04' · d0753238
  Jean-Baptiste Mardelle authored Mar 22, 2017
  
  d0753238
- Add option to lock aspect ratio in geometry effects/transitions · 243dff06
  Jean-Baptiste Mardelle authored Mar 22, 2017
  
  243dff06
20 Mar, 2017 4 commits
- Merge branch '17.04' · 78a1d89f
  Jean-Baptiste Mardelle authored Mar 21, 2017
  
  78a1d89f
- Ensure we have a default profile at first start · 3d53f186
  Jean-Baptiste Mardelle authored Mar 21, 2017
  
  3d53f186
- Merge branch '17.04' · 2fd4a6c7
  Jean-Baptiste Mardelle authored Mar 21, 2017
  
  2fd4a6c7
- Profile widget: make UI more compact, remember filter status if default... · 425efbbb
  Jean-Baptiste Mardelle authored Mar 21, 2017
```
Profile widget: make UI more compact, remember filter status if default profile matches, ensure selected profile is visible
CCBUG: 377853
```
  425efbbb