Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2010-03-31 02:29:02 +04:00
commit f2572fdda0
33 changed files with 138 additions and 110 deletions

View file

@ -166,7 +166,7 @@ enum TimeConstants
DAY = HOUR*24,
MONTH = DAY*30,
YEAR = MONTH*12,
IN_MILISECONDS = 1000
IN_MILLISECONDS = 1000
};
enum AccountTypes

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9640"
#define REVISION_NR "9644"
#endif // __REVISION_NR_H__