comparison common.h @ 33:ff8d64625aa3

Added retry_merge. Fixed bug in "after merge" commit.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 19 Jun 2010 00:23:09 +0300
parents 4f307720272f
children 43e3b271d293
comparison
equal deleted inserted replaced
32:4f307720272f 33:ff8d64625aa3
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.0" 11 #define APPVERSION "0.5.1"
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: "