OpenGL based compositing and windows manager: Changes to 'master'

Dan Winship danw at kemper.freedesktop.org
Thu Jul 20 14:56:08 PDT 2006


 .cvsignore                   |    3 
 autogen.sh                   |   13 
 configure.ac                 |    4 
 include/compiz.h             |    4 
 plugins/.cvsignore           |    1 
 plugins/Makefile.am          |   26 
 plugins/compiz.schemas.in    |13480 +++++++++++++++++++++++++++++++++++++++++++
 plugins/compiz.schemas.in.in | 3468 -----------
 plugins/cube.c               |   62 
 plugins/decoration.c         |   20 
 plugins/fade.c               |   38 
 plugins/gconf-compiz-utils.c |   16 
 plugins/gconf-dump.c         |  169 
 plugins/minimize.c           |   30 
 plugins/move.c               |   22 
 plugins/place.c              |    8 
 plugins/resize.c             |    8 
 plugins/rotate.c             |   90 
 plugins/scale.c              |   58 
 plugins/switcher.c           |   74 
 plugins/water.c              |   28 
 plugins/wobbly.c             |   76 
 plugins/zoom.c               |   36 
 po/POTFILES.in               |   18 
 po/cs.po                     | 2176 ++----
 po/de.po                     | 2231 ++-----
 po/es.po                     | 2212 ++-----
 po/fi.po                     | 2208 ++-----
 po/fr.po                     | 2242 ++-----
 po/hu.po                     | 2183 ++----
 po/it.po                     | 2222 ++-----
 po/ja.po                     | 2168 ++----
 po/pl.po                     | 2170 ++----
 po/pt_BR.po                  | 2232 ++-----
 po/zh_CN.po                  | 2156 ++----
 po/zh_TW.po                  | 2156 ++----
 src/display.c                |  148 
 src/main.c                   |   22 
 src/screen.c                 |   30 
 39 files changed, 25146 insertions(+), 19162 deletions(-)

New commits:
commit 7e818888cd806209cc8b958f34d6f9937be174d7
Author: Dan Winship <danw at novell.com>
Date:   Thu Jul 20 17:53:51 2006 -0400

    Update new edges stuff for new l10n stuff
    and fix compiz.schemas to use the configure-specified scale corner again

commit 9b13e0739e26787bf9bada0494e205106c12af17
Merge: 43046fc... 47f5066...
Author: Dan Winship <danw at twelve-monkeys.boston.ximian.com>
Date:   Thu Jul 20 17:45:20 2006 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz
    
    Conflicts:
    
    	plugins/compiz.schemas.in.in
    	plugins/gconf-dump.c
    	plugins/scale.c

commit 43046fc89bee84f3767d450e706ef5b78c3d7dce
Author: Dan Winship <danw at twelve-monkeys.boston.ximian.com>
Date:   Thu Jul 20 15:18:56 2006 -0400

    Improve the localization of compiz.schemas (bnc 176752)
    
    Instead of using intltool to parse and translate the generated
    compiz.schemas, we now mark the strings for translation in the code,
    and directly generate a localized schemas file, leaving untranslated
    the bits that need to be untranslated.




More information about the xorg-commit mailing list