Diffusion Calligra defb5b438485

Merge branch 'master' into formulashape-matlab_tool-cyrille_berger
defb5b438485
Actions

Authored by cyrille on Oct 21 2012, 3:14 PM.

Description

Merge branch 'master' into formulashape-matlab_tool-cyrille_berger

Conflicts:
plugins/formulashape/CMakeLists.txt

Details

Committed
cyrilleOct 21 2012, 3:14 PM
Parents
R8:299aa3294920: Merge branch 'master' into formulashape-matlab_tool-cyrille_berger
R8:33f15f4a0fd0: Add the following enhancements to videoshape
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
33f15f4a0fd0Gopalakrishna Bhat A
Add the following enhancements to videoshape 
Oct 21 2012
13bf79355685Sujith Haridasan
Adding text search feature to calligra active spreadsheets 
Oct 19 2012
3e3b3ffcd371Inge Wallin
Roundtrip master documents 
Oct 19 2012
c9fbd1781bebBoudewijn Rempt
Revert "don't use kfilewidget, it is broken for the kde libs we use with sketch" 
Oct 18 2012
ff97365bcd4bBoudewijn Rempt
Kill the kde deamons on shutdown. 
Oct 18 2012
fe8b4d8cdc61Boudewijn Rempt
don't use kfilewidget, it is broken for the kde libs we use with sketch 
Oct 18 2012
4b27b752e50cBoudewijn Rempt
Enable opengl on windows again 
Oct 18 2012
e925255ea8edYue Liu
disable some plugins for flow. 
Oct 17 2012
8a2624aaadd6Jaroslaw Staniek
Overwriting object with the same name is now possible 
Oct 17 2012
d46e5fc89f93Script Kiddy
SVN_SILENT made messages (.desktop file) 
Oct 16 2012
000fa4e943f5Inge Wallin
Enable a better HTML export filter and remove the old one. 
Oct 16 2012
ea55b5af6cb5Sven Langkamp
fix document creation in okular generator 
Oct 16 2012
150903e76c43Timothée Giet
Update preset pack 
Oct 15 2012
d128be8bf363Sven Langkamp
skip ycbcr in histogram test 
Oct 15 2012
5a91afcb7d50Sujith Haridasan
Fixing the previous search issue in the presentation slide. Along with that… 
Oct 15 2012
c30616aaf1fcSven Langkamp
draw warped image before drawing the handles, so handles don't diappear below… 
Oct 15 2012
ad0416095c41Luigi Toscano
docs: add missing ids, avoid duplications 
Oct 14 2012
a1d8701c86b1Sven Langkamp
move KisSelectionsBenchmark to benchmark directory 
Oct 14 2012
fc804962fee8Timothée Giet
fix design templates 
Oct 14 2012
a02ae9c77a20Timothée Giet
Fix BD template 
Oct 14 2012
e59b4ec02276Inge Wallin
Remove a lot of "done" things from the TODO. 
Oct 13 2012
932175c97a6aSujith Haridasan
Adding text search feature to Calligra Active presentation 
Oct 13 2012
7a9d30a8ef71Jaroslaw Staniek
Improve tristate class 
Oct 13 2012
cc1070590b6dJaroslaw Staniek
fix dox GIT_SILENT 
Oct 13 2012
035940835b54Jaroslaw Staniek
Merge remote-tracking branch 'origin/master' into master-staniek 
Oct 13 2012
867cddedd7b7Jaroslaw Staniek
Do not build kexi if calligradb is not build 
Oct 13 2012
173472c978e1Jaroslaw Staniek
initialize random numbers generator in driver manager, needed for temp tables 
Oct 13 2012
dae8de6e2a76Jaroslaw Staniek
Core: add possibility of removing view from window 
Oct 13 2012
d195db7970c7Jaroslaw Staniek
KexiDB Utils: added methods for sqlite's .sql file importing, etc. 
Oct 13 2012
a3765e59d847Jaroslaw Staniek
Table/Index/Query/FieldList: make methods const 
Oct 13 2012
cd6bc247562eJaroslaw Staniek
TableSchema: copy ctor copies lookup too 
Oct 13 2012
63500238f0fbJaroslaw Staniek
KexiDB: LookupFieldSchema: improve debug and API, add copy ctor 
Oct 13 2012
b253ee5a9720Jaroslaw Staniek
koproperty: use QMap so items are always sorted by key 
Oct 13 2012
5d6999b0563dSven Langkamp
fix node model test 
Oct 12 2012
8ac17fc6fe79Sven Langkamp
fix autobrush for non-uniform color information 
Oct 12 2012
70d9e4b98a4eInge Wallin
Add support for chapter titles in EPUB files. 
Oct 12 2012
c0fca02a9b70Sven Langkamp
use proper C++ syntax 
Oct 12 2012
551fad066a4bSven Langkamp
set precision to 5 if not provided by the paintop to keep it compatible with… 
Oct 12 2012
72b48b6143c3Pino Toscano
docs: sheets: remove id for <book> 
Oct 12 2012
e44aa1f6bc41T.C. Hollingsworth
docs: restore <(book|article)info> 
Oct 12 2012
830642a4d9c9T.C. Hollingsworth
docs: add id attribute to <book> and <article> elements 
Oct 12 2012
97808b725c26Sven Langkamp
fix unit test, grabColorSpace did return 0 if the colorspace was already… 
Oct 12 2012
8ec19e6db68eFriedrich W. H. Kossebau
Fix compile on linux 
Oct 11 2012
6f5bfa6ae211Boudewijn Rempt
KisCanvas2: these slots are private 
Oct 11 2012
51c6104de6e2Boudewijn Rempt
re-order the methods to make more sense 
Oct 11 2012
f1e92a44095aBoudewijn Rempt
Make compile on Windows with MSVC 
Oct 11 2012
00dc216fbcebBoudewijn Rempt
Make compile with the Intel compiler on Windows 
Oct 11 2012
c8c33265122dBoudewijn Rempt
fix coompilation in windows with msvc 
Oct 11 2012
9656ae773848Script Kiddy
SVN_SILENT made messages (.desktop file) 
Oct 10 2012
b73804bc37ebDmitry Kazakov
Optimized Auto Brush mask filling code 
Oct 10 2012

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.