[rkward-cvs] rkward/rkward main.cpp,1.19,1.20

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12520/rkward

Modified Files:
	main.cpp 
Log Message:
Show correct version in about dialog. Message merge

Index: main.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/main.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** main.cpp	29 Sep 2005 16:02:50 -0000	1.19
--- main.cpp	25 Oct 2005 15:22:28 -0000	1.20
***************
*** 61,64 ****
--- 61,65 ----
  
  #include "rkward.h"
+ #include "config.h"
  
  #include "debug.h"
***************
*** 67,78 ****
  int RK_Debug_Flags = ALL;
  
! static const char *version =
!        I18N_NOOP("0.3.1");
  
- static const char *description =
- 	I18N_NOOP("RKWard");
- // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
- 	
- 	
  static KCmdLineOptions options[] =
  {
--- 68,74 ----
  int RK_Debug_Flags = ALL;
  
! static const char *version = I18N_NOOP(VERSION);
! static const char *description = I18N_NOOP("RKWard");
  
  static KCmdLineOptions options[] =
  {