[Cmake-commits] [cmake-commits] hoffman committed CMake.desktop 1.2 1.2.2.1 CMakeSetupDialog.cxx 1.63.2.1 1.63.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv13963/Source/QtDialog

Modified Files:
      Tag: CMake-2-8
	CMake.desktop CMakeSetupDialog.cxx 
Log Message:
Merge in changes for RC 3


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.63.2.1
retrieving revision 1.63.2.2
diff -C 2 -d -r1.63.2.1 -r1.63.2.2
*** CMakeSetupDialog.cxx	1 Oct 2009 21:21:15 -0000	1.63.2.1
--- CMakeSetupDialog.cxx	9 Oct 2009 20:11:37 -0000	1.63.2.2
***************
*** 343,347 ****
  void CMakeSetupDialog::finishGenerate(int err)
  {
!   this->enterState(ReadyGenerate);
    if(err != 0)
      {
--- 343,347 ----
  void CMakeSetupDialog::finishGenerate(int err)
  {
!   this->enterState(ReadyConfigure);
    if(err != 0)
      {

Index: CMake.desktop
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMake.desktop,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CMake.desktop	18 Dec 2008 14:37:20 -0000	1.2
--- CMake.desktop	9 Oct 2009 20:11:36 -0000	1.2.2.1
***************
*** 1,5 ****
  [Desktop Entry]
  Version=1.0
- Encoding=UTF-8
  Name=CMake
  Comment=Cross-platform buildsystem
--- 1,4 ----