commit 1022aad97078dcbf5fde98bfee012c5428202dcd Author: Emmanuele Bassi Date: Tue Nov 22 11:59:33 2011 +0000 Release Clutter 1.9.2 (snapshot) configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a13b095dc2beb9d4c1c3fe5cf15ebe02376e958c Author: Emmanuele Bassi Date: Tue Nov 22 12:11:06 2011 +0000 build: Fix distcheck clutter/Makefile.am | 40 +++++++++++++++++++--------------------- tests/conform/Makefile.am | 18 ++++++++---------- tests/interactive/Makefile.am | 27 +++++++++++++++------------ 3 files changed, 42 insertions(+), 43 deletions(-) commit cdd5f6142c767f76cd8a70274eda203b1a5a35b2 Author: Emmanuele Bassi Date: Tue Nov 22 01:20:48 2011 +0000 Update NEWS file NEWS | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) commit a24ff882b6dd9eb3ab0a7cfdbb047b84a1bc5893 Author: Emmanuele Bassi Date: Tue Nov 22 01:00:58 2011 +0000 conform: Bail out GLSL-based tests If we don't have GLSL support on the platform. tests/conform/test-pick.c | 6 ++++++ tests/conform/test-shader-effect.c | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) commit 52ea1510a19233413a37801e1a72832027fcc548 Author: Emmanuele Bassi Date: Tue Nov 22 00:29:08 2011 +0000 docs: Fixes for the API reference doc/reference/clutter/Makefile.am | 1 + doc/reference/clutter/clutter-docs.xml.in | 1 + doc/reference/clutter/clutter-sections.txt | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) commit 02a020a7fd4b58a815fa80578aa32d0aa6d0e4d9 Author: Florian Müllner Date: Fri Nov 18 22:04:31 2011 +0100 Add missing include clutter-profile.h used to be included via clutter-debug.h, but no more (8a4dc3c011) ... clutter/cogl/clutter-stage-cogl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 6e15fd930a2b5cfb83f0edaf03be4a7d2e6ab8d2 Author: Emmanuele Bassi Date: Fri Nov 18 17:54:19 2011 +0000 debug: Simple whitespace cleanups clutter/clutter-debug.h | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) commit 8a4dc3c011fb3dfe8157dfc228fedd72a81c3c12 Author: Emmanuele Bassi Date: Fri Nov 18 17:44:42 2011 +0000 debug: Clean up profile/debug symbols Since we have a _clutter_debug_message() function compiled in unconditionally we have no further need for the equivalent conditional version defined in clutter-profile.[ch]: we can simply do the work in one function. clutter/clutter-debug.h | 26 ++++++++++++-------------- clutter/clutter-main.c | 5 +++++ clutter/clutter-profile.c | 13 ------------- clutter/clutter-profile.h | 18 ++++++++---------- 4 files changed, 25 insertions(+), 37 deletions(-) commit 92585be4d805a1cb0b60df92a0b235fd1a2824be Author: Emmanuele Bassi Date: Fri Nov 18 17:32:01 2011 +0000 debug: Remove CLUTTER_GLERR The macro hasn't been used in a long while, as Cogl had its own version of it; and Clutter hasn't been using pure GL for some time now. clutter/clutter-debug.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) commit 2d76407016075df8f3b12ffb4429c37ae33ccd33 Author: Emmanuele Bassi Date: Fri Nov 18 17:30:39 2011 +0000 debug: Remove CLUTTER_MARK The debug macro is seldom used, and it's a bit lame at that. clutter/clutter-debug.h | 3 --- clutter/clutter-main.c | 4 ---- clutter/clutter-texture.c | 8 -------- 3 files changed, 0 insertions(+), 15 deletions(-) commit ecdb12ecc3b5ab098173e580b693de1629ddc016 Author: Emmanuele Bassi Date: Fri Nov 18 17:23:30 2011 +0000 conform/cogl-pixel-buffer: Remove unused variable tests/conform/test-cogl-pixel-buffer.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 90f37d5636f5a1cec3e8423625647f774af7141f Author: Emmanuele Bassi Date: Fri Nov 18 17:22:12 2011 +0000 cairo-texture: Skip ::draw emission for 0x0 surfaces This also avoids an assertion failure. clutter/clutter-cairo-texture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 225820c4b4d5af5e619e941b67dbdba8e47a432d Author: Rico Tzschichholz Date: Fri Nov 18 18:08:01 2011 +0100 Fix 'make dist' tests/interactive/Makefile.am | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) commit 516b5de7566a453d1009a5465e9452d9642d1fee Author: Rico Tzschichholz Date: Fri Nov 18 17:38:45 2011 +0100 tests: Remove some trailing spaces tests/interactive/Makefile.am | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 73e7404652567a5a095021909b90507c1d7ed42e Author: Emmanuele Bassi Date: Fri Nov 18 15:12:45 2011 +0000 build: Clean up the VS build rules Some minor cleanups of the Visual Studio rules in the interactive and conformance test suites. .gitignore | 1 + build/win32/.gitignore | 1 + tests/conform/Makefile.am | 35 +++++++++++++++++------------------ tests/interactive/Makefile.am | 28 +++++++++++++--------------- 4 files changed, 32 insertions(+), 33 deletions(-) commit b62216955ff768fb3ec4e8f3f99e6bdd1fd27fe2 Author: Rico Tzschichholz Date: Fri Nov 18 13:39:06 2011 +0100 build: Make sure test-unit-names.h is generated tests/interactive/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a69c4fdc59682579a05b157afa822f6fc9e7a336 Merge: d3a9bf2 ebf12a8 Author: Chun-wei Fan Date: Thu Nov 17 22:17:01 2011 +0800 Merge branch 'master' into msvc-support-master commit ebf12a8cd724ff5136021d4b3aaa6e61531620d4 Author: Emmanuele Bassi Date: Wed Nov 16 16:42:41 2011 +0000 docs: Document the DeformEffect wrap-mode change The change from CoglVertexBuffer to CoglPrimitive led to a change of the default wrap-mode for the pipeline. Since using REPEAT can introduce artifacts when sampling outside the [ 0, 1 ] texture coordinates range, and since the default wrap mode was not documented anyway, we want to keep the change from REPEAT to CLAMP, but it's worth adding an entry in the release notes. README.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit ef02de19e8a351b0f38b05d19423dd4a4eb3012c Author: Emmanuele Bassi Date: Wed Nov 16 14:50:36 2011 +0000 interactive: Remove test-model The model API is already tested in the conformance test suite. tests/interactive/Makefile.am | 1 - tests/interactive/test-model.c | 237 ---------------------------------------- 2 files changed, 0 insertions(+), 238 deletions(-) commit 15000307fdf06efda2b74889e021c63deb354a51 Author: Emmanuele Bassi Date: Wed Nov 16 13:59:11 2011 +0000 interactive: Remove test-unproject The coordinate transformation code is exercised throughout the conformance and interactive tests, so there's no need to have a specific interactive test that doesn't do anything more complicated than calling clutter_actor_transform_stage_point(). tests/interactive/Makefile.am | 1 - tests/interactive/test-unproject.c | 157 ------------------------------------ 2 files changed, 0 insertions(+), 158 deletions(-) commit d3a9bf201b42f156d4743b8a194d0e03f41ff7ef Merge: 39c3ccf bf9339b Author: Chun-wei Fan Date: Wed Nov 16 09:15:16 2011 +0800 Merge branch 'master' into msvc-support-master commit bf9339b8f468dfb12eee95472f0b284acbf56487 Author: Emmanuele Bassi Date: Tue Nov 15 17:58:25 2011 +0000 Deprecate some more old, useless API We still ship clutter_get_show_fps() and clutter_get_debug_enabled() as public entry points. Yet another case of missing API review prior to the 1.0 release, so really the bucket stops around my desk. Let's deprecate these two useless functions, and reduce the API footprint of Clutter. clutter/clutter-main.c | 28 +++++++++++++++++++--------- clutter/clutter-main.h | 2 -- clutter/clutter-private.h | 2 ++ clutter/clutter-stage.c | 4 ++-- clutter/deprecated/clutter-main.h | 6 ++++++ 5 files changed, 29 insertions(+), 13 deletions(-) commit 66d46fd55e15b7e882cbf99d7525475eb35c4322 Author: Emmanuele Bassi Date: Tue Nov 15 17:47:00 2011 +0000 Deprecate clutter_get_timestamp() This function should have never been made public in the first place; its output depends on a configuration option of Clutter, and it's basically useful only for internal debugging. clutter/clutter-main.c | 16 ++++++++++++++-- clutter/clutter-main.h | 1 - clutter/deprecated/clutter-main.h | 3 +++ 3 files changed, 17 insertions(+), 3 deletions(-) commit 59f395d856e46f6c6a2bc8901db3ecb3f73ee50a Author: Emmanuele Bassi Date: Tue Nov 15 17:39:49 2011 +0000 Rework debug output Make it consistent across the various build options (with or without profiling enabled), and add a timestamp using the monotonic clock to every debug message. clutter/clutter-debug.h | 16 +++++++++------- clutter/clutter-main.c | 26 ++++++++++++++++++++++++++ clutter/clutter-profile.c | 10 ++++------ clutter/clutter-profile.h | 41 +++++++++++++++-------------------------- 4 files changed, 54 insertions(+), 39 deletions(-) commit c6e487a5c121dc64604232eb971a4d959ea1b3d2 Author: Emmanuele Bassi Date: Tue Nov 15 16:07:13 2011 +0000 Remove CLUTTER_TIMESTAMP debug macro It's pretty much unused, and it doesn't print out really informative messages. We should make CLUTTER_NOTE print out a decent timestamp instead. clutter/clutter-debug.h | 16 ---------------- clutter/clutter-main.c | 2 +- clutter/clutter-stage.c | 12 ++++++------ clutter/clutter-timeline.c | 6 +++--- 4 files changed, 10 insertions(+), 26 deletions(-) commit 8b2df7ced9e0be99cc9bc56678ad12ba614d75de Author: Emmanuele Bassi Date: Tue Nov 15 15:34:51 2011 +0000 Remove the GTimer used by clutter_get_timestamp() Use g_get_monotonic_time() instead, which does the right thing. clutter/clutter-main.c | 21 ++------------------- clutter/clutter-private.h | 3 --- 2 files changed, 2 insertions(+), 22 deletions(-) commit f63891f030f6cb7d72a911e15e8176cd6b27f50e Author: Emmanuele Bassi Date: Tue Nov 15 14:59:50 2011 +0000 texture: Do not use clutter_get_timestamp() The clutter_get_timestamp() output depends on whether Clutter was compiled with debugging support — it's meant to be used only by the debugging notes, and it should not be used for anything else. clutter/clutter-texture.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 58b6ad787b115f89eb8f1d982e00cb4e9e55b7a6 Author: Neil Roberts Date: Tue Nov 8 15:45:14 2011 +0000 deform-effect: Use CoglPipeline instead of setting legacy state Instead of calling cogl_set_depth_test_enabled and cogl_set_backface_culling_enabled ClutterDeformEffect now uses the experimental CoglPipeline API. Those global state functions will soon be deprecated in Cogl and they are implemented by flushing a temporary override pipline which isn't ideal. Using the new culling API we can also avoid having a separate buffer of indices for the back of the texture by just changing the culling mode to cull front baces instead of the back. https://bugzilla.gnome.org/show_bug.cgi?id=663636 clutter/clutter-deform-effect.c | 171 ++++++++++++++------------------------ 1 files changed, 63 insertions(+), 108 deletions(-) commit 8a752d674b4b8711a3912ff18506bb13cf238034 Author: Neil Roberts Date: Tue Nov 8 11:37:27 2011 +0000 deform-effect: Use CoglPrimitives instead of CoglVertexBuffers This changes ClutterDeformEffect to use a CoglAttributeBuffer with a CoglPrimitive instead of the old CoglVertexBuffer. The old vertex buffer code is now implemented in terms of the attribute buffer code and it will eventually be deprecated. Using CoglPrimitives should be slightly more efficient. This also changes the struct we store the vertices to be CoglVertexP3T2C4 instead of CoglTextureVertex. The latter is technically not compatible with neither vertex buffers nor attribute buffers because it contains a CoglColor and the internal members of that are private so it is not valid to assume it contains 4 bytes and use that as an attribute. Also it contains padding so it ends up redundantly creating a larger buffer. CoglTextureVertex is in the public API for the deform_vertex virtual so we still have to maintain that. Instead of directly manipulating the array to upload, the application is now passed a stack allocated temporary struct which gets converted to a CoglVertexP3T2C4. This also means that we can map the buffer as write only and still let the application read-write the vertex. The paint debug code to draw line strips for the deform mesh was previously trying to set a red source material. However this wasn't working because the material color was being overwritten by the color attribute in the vertex buffer. This patch fixes that by creating a seperate primitive for the lines and not adding the color attribute. The lines code was also drawing both the front and back indices. I don't think that entirely makes sense so I've just changed it to draw only the front indices. Maybe painting both would make more sense if backface culling was still enabled. https://bugzilla.gnome.org/show_bug.cgi?id=663636 clutter/clutter-deform-effect.c | 323 ++++++++++++++++++++++++--------------- 1 files changed, 201 insertions(+), 122 deletions(-) commit 39c3ccfca5dc3d10423cb3972a481bfdc915eadc Author: Chun-wei Fan Date: Tue Nov 15 17:18:51 2011 +0800 Visual C++ support update Add Projects to compile the performance test files. build/win32/vs10/Makefile.am | 14 ++ build/win32/vs10/clutter.props | 4 + build/win32/vs10/clutter.sln | 70 ++++++++ build/win32/vs10/install.vcxproj | 28 ++++ build/win32/vs10/test-picking-performance.vcxproj | 169 ++++++++++++++++++++ .../vs10/test-picking-performance.vcxproj.filters | 23 +++ .../vs10/test-state-hidden-performance.vcxproj | 169 ++++++++++++++++++++ .../test-state-hidden-performance.vcxproj.filters | 23 +++ .../test-state-interactive-performance.vcxproj | 169 ++++++++++++++++++++ ...t-state-interactive-performance.vcxproj.filters | 23 +++ .../win32/vs10/test-state-mini-performance.vcxproj | 169 ++++++++++++++++++++ .../test-state-mini-performance.vcxproj.filters | 23 +++ build/win32/vs10/test-state-performance.vcxproj | 169 ++++++++++++++++++++ .../vs10/test-state-performance.vcxproj.filters | 23 +++ .../win32/vs10/test-state-pick-performance.vcxproj | 169 ++++++++++++++++++++ .../test-state-pick-performance.vcxproj.filters | 23 +++ .../win32/vs10/test-text-perf-performance.vcxproj | 169 ++++++++++++++++++++ .../test-text-perf-performance.vcxproj.filters | 23 +++ build/win32/vs9/Makefile.am | 7 + build/win32/vs9/clutter.sln | 98 +++++++++++ build/win32/vs9/clutter.vsprops | 4 + build/win32/vs9/test-picking-performance.vcproj | 166 +++++++++++++++++++ .../win32/vs9/test-state-hidden-performance.vcproj | 166 +++++++++++++++++++ .../vs9/test-state-interactive-performance.vcproj | 166 +++++++++++++++++++ build/win32/vs9/test-state-mini-performance.vcproj | 166 +++++++++++++++++++ build/win32/vs9/test-state-performance.vcproj | 166 +++++++++++++++++++ build/win32/vs9/test-state-pick-performance.vcproj | 166 +++++++++++++++++++ build/win32/vs9/test-text-perf-performance.vcproj | 166 +++++++++++++++++++ 28 files changed, 2731 insertions(+), 0 deletions(-) commit 2a54db4557a0e4b417535ef162590a414a8a3c5b Author: Chun-wei Fan Date: Tue Nov 15 16:29:35 2011 +0800 test-picking.c: Use G_PI rather than M_PI M_PI is not universally available... tests/performance/test-picking.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 2a86ecc4b9516222c4f74ba106d7c2275baa9ae2 Author: Chun-wei Fan Date: Tue Nov 15 16:19:06 2011 +0800 Update interactive/conformance .bat names Add a -clutter suffix to avoid confustion with others, such as COGL. tests/conform/Makefile.am | 2 +- tests/interactive/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) commit 119169b4a16b739f833bd83b8484ae04ce30ae2b Author: Chun-wei Fan Date: Tue Nov 15 15:31:17 2011 +0800 Fix up VS property sheets Should be ..\..\..\clutter\deprecated\clutter-keysyms.h, not ..\..\..\clutter\deprecated\clutter-keysyms-deprecated.h build/win32/vs10/clutter.props | 2 +- build/win32/vs9/clutter.vsprops | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 794b49990a726df15b43c0fe741b7067ee2a3f95 Author: Chun-wei Fan Date: Tue Nov 15 15:19:09 2011 +0800 Update Visual C++ projects Update output DLL/LIB names to be consistent with the autotools output, due to the newl-introduced multi-backend feature (only the Win32 backend is supported here for now, GDK3 support will be added when it stabilizes) build/win32/vs10/clutter.vcxprojin | 16 ++++++++-------- build/win32/vs9/clutter.vcprojin | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) commit 8d0c68347a4ee33bb77c7c21760b63f15db9cf26 Merge: 96d4e52 b281f20 Author: Chun-wei Fan Date: Tue Nov 15 14:20:22 2011 +0800 Merge branch 'master' into msvc-support-master commit b281f2090a8fb042cb471611eab54c26ceba8074 Author: Emmanuele Bassi Date: Mon Nov 14 17:04:14 2011 +0000 Store the master clock pointer in the main context Let's try and move all singletons into ClutterMainContext. clutter/clutter-master-clock.c | 10 ++++------ clutter/clutter-private.h | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) commit f1ebfe30cee518811454b2bea6558bcfd19a5eb7 Author: Emmanuele Bassi Date: Mon Nov 14 15:43:20 2011 +0000 stage-manager: Store the stage manager into the main context Use the main context to store the stage manager singleton, instead of a static pointer inside clutter-stage-manager.c. clutter/clutter-private.h | 4 ++++ clutter/clutter-stage-manager.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) commit 96d4e527ea8bf0e7fd238ba6cafd578f86fea27f Merge: 2628ba7 e7720c4 Author: Chun-wei Fan Date: Mon Nov 14 22:57:50 2011 +0800 Merge branch 'master' into msvc-support-master commit e7720c415649cb67453b90764258f398f8e97107 Author: Lionel Landwerlin Date: Wed Nov 9 02:04:31 2011 +0000 deform-effect: do not redraw actor on invalidate When invalidating the deform effect, we are invalidating the vertices shaping the deformation of an actor. Therefore, there is no need to trigger a redraw of the associated actor, we can just repaint the effect. Signed-off-by: Lionel Landwerlin https://bugzilla.gnome.org/show_bug.cgi?id=663720 clutter/clutter-deform-effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b5ac9277636bdeabcd3f2b6b62e234b085a5f49f Author: Emmanuele Bassi Date: Mon Nov 14 11:46:02 2011 +0000 stage: Clean up Improve the consistency of the code. clutter/clutter-stage-manager.c | 14 +++++------- clutter/clutter-stage.c | 41 +++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 26 deletions(-) commit b2d1dfa932d20d17c236f2646879a38876302190 Author: Emmanuele Bassi Date: Mon Nov 14 11:45:14 2011 +0000 stage: Deprecate clutter_stage_queue_redraw() It's a wrapper around clutter_actor_queue_redraw(). clutter/clutter-stage.c | 5 ++--- clutter/clutter-stage.h | 1 - clutter/deprecated/clutter-stage.h | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) commit f5d011cb67f06d35721c78f3e93389da7e550ebd Merge: bbe54aa 213e6e4 Author: Emmanuele Bassi Date: Mon Nov 14 11:07:54 2011 +0000 Merge branch 'deprecate-default-stage' * deprecate-default-stage: evdev: do not associate device with stage evdev: don't even process events without a default stage docs: Note default stage deprecation in README docs: Remove clutter_stage_get_default() stage: Deprecate the default stage script: Do not use clutter_stage_get_default() cally/actor: Do not use the default stage as a fallback Try to mop up the default stage mess performance/*: Do not use clutter_stage_get_default() interactive/*: Do not use clutter_stage_get_default() Merge with a11y micro-bench/*: Do not use clutter_stage_get_default() accessibility/*: Do not use clutter_stage_get_default() conform/*: Do not use clutter_stage_get_default() commit bbe54aa2ec61824ec05684bb2de6297edc289500 Author: Chun-wei Fan Date: Mon Nov 14 13:36:52 2011 +0800 Fix clutter-bakend-win32.c The VBLANK environmental variable is done universally in clutter-main.c as in commits e8562089 (main: Add a sync-to-vblank global flag) and db211a21 (Remove per-backend CLUTTER_VBLANK envvar), so remove these things here as well. https://bugzilla.gnome.org/show_bug.cgi?id=663999 clutter/win32/clutter-backend-win32.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) commit 2628ba70cdd8dccd90a487466b42f0fe136f6860 Author: Chun-wei Fan Date: Mon Nov 14 13:36:52 2011 +0800 Fix clutter-bakend-win32.c The VBLANK environmental variable is done universally in clutter-main.c as in commits e8562089 (main: Add a sync-to-vblank global flag) and db211a21 (Remove per-backend CLUTTER_VBLANK envvar), so remove these things here as well. clutter/win32/clutter-backend-win32.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) commit ebf3147a0054ebc577cf4822d85ff03ce5562f65 Author: Chun-wei Fan Date: Mon Nov 14 13:33:04 2011 +0800 clutter-config.h.win32: Add CLUTTER_INPUT_NULL clutter/clutter-config.h.win32 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c73a1fa7df9a4ec1a5c8db9b7d5f4d2169f40174 Author: Chun-wei Fan Date: Mon Nov 14 13:32:29 2011 +0800 Fix VS property sheets Should be clutter-keysyms.compat.h that should land in deprecated/, not clutter-keysyms.h build/win32/vs10/clutter.props | 8 ++++---- build/win32/vs9/clutter.vsprops | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 145685b099d86fd5d6a49225834dd40962a9e091 Author: Chun-wei Fan Date: Mon Nov 14 12:49:52 2011 +0800 Update config.h.win32.in/clutter-config.h.win32 -Make the contents of config.h.win32.in more like config.h.in -Define CLUTTER_INPUT_WIN32 accordingly (no GDK3 defines yet, until GDK3 on Windows is more stable) clutter/clutter-config.h.win32 | 1 + config.h.win32.in | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) commit 1b7249a2478b78a4242c766d85347e71c3a70ba4 Merge: c52d06a 65a07db Author: Chun-wei Fan Date: Mon Nov 14 11:40:49 2011 +0800 Merge branch 'master' into msvc-support-master commit 65a07db5c07b2601835565ce48db689f634203b4 Author: Fran Diéguez Date: Sun Nov 13 18:52:21 2011 +0100 Updated Galician translations po/clutter-1.0.pot | 1455 +++++++++++++++++++++++++++------------------------- po/gl.po | 765 ++++++++++++++-------------- 2 files changed, 1141 insertions(+), 1079 deletions(-) commit c52d06a5b9fe05b09836d364dba3a20d487f62b5 Author: Chun-wei Fan Date: Sat Nov 12 12:03:53 2011 +0800 Update clutter-config.h.win32 The CLUTTER_WINDOWING_WIN32 needs to be in-sync with what is in configure.ac, due to the implementation of multiple backends. clutter/clutter-config.h.win32 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a0c9d294b0c2784b1459a21e5d8dbf8af9705432 Author: Daniel Mustieles Date: Fri Nov 11 18:16:06 2011 +0100 Updated Spanish translation po/es.po | 770 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 392 insertions(+), 378 deletions(-) commit 028b716f3310c3c9cae34c4cd23bb00f27f0103d Author: Piotr Drąg Date: Thu Nov 10 19:54:53 2011 +0100 Updated POTFILES.in po/POTFILES.in | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) commit 6d4f105ab251282e8d6453df5b585646e4bafdcf Author: Rico Tzschichholz Date: Thu Nov 10 19:02:19 2011 +0100 po: update POTFILES.in po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit b12a94dc272b0b4c9c3ec5e9de5845cd24a2f09a Author: Rico Tzschichholz Date: Thu Nov 10 19:01:48 2011 +0100 docs: fix some headers paths clutter/cex100/clutter-cex100.h.in | 2 +- doc/reference/clutter/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) commit 821ccef55562798bcda64ecc3d4b3f6252867d8b Author: Emmanuele Bassi Date: Thu Nov 10 17:59:17 2011 +0000 build: Disable evdev input by default It's an experimental input backend, so it should be enabled explicitly. README.in | 4 ++--