comparison common.h @ 37:46260ce88b71

Version 0.5.4. Offer to retry merge directly after failed merge attempt.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 19 Jun 2010 13:10:06 +0300
parents 5986d0758069
children 3fa4803ecf44
comparison
equal deleted inserted replaced
36:5986d0758069 37:46260ce88b71
6 ****************************************************************************/ 6 ****************************************************************************/
7 7
8 #include <QtCore> 8 #include <QtCore>
9 9
10 #define APPNAME "HgExplorer" 10 #define APPNAME "HgExplorer"
11 #define APPVERSION "0.5.3" 11 #define APPVERSION "0.5.4"
12 #define MY_ICON_SIZE 32 12 #define MY_ICON_SIZE 32
13 #define REPOMENU_TITLE "Repository actions" 13 #define REPOMENU_TITLE "Repository actions"
14 #define WORKFOLDERMENU_TITLE "Workfolder actions" 14 #define WORKFOLDERMENU_TITLE "Workfolder actions"
15 #define EXITOK(x) ((x)==0) 15 #define EXITOK(x) ((x)==0)
16 #define CHGSET "changeset: " 16 #define CHGSET "changeset: "