0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-28 10:28:10 +03:00
Commit Graph

69 Commits

Author SHA1 Message Date
Arin Alexander
36df242787 Russian translation has been fixed
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 17:00:58 +03:00
Arin Alexander
1354c4a253 Russian translation has been fixed 2017-06-28 16:58:01 +03:00
Arin Alexander
67d263ed4f Merge branch 'master' into develop
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 11:29:27 +03:00
Arin Alexander
4755bd7811 Russian translation has been fixed 2017-06-28 11:16:50 +03:00
Arin Alexander
76a1ac5938 Russian translation has been updated
# Conflicts:
#	translations/limereport_ru.ts
2017-06-27 23:21:46 +03:00
Arin Alexander
af3d5840d6 Russian translation has been updated 2017-06-27 23:12:22 +03:00
Arin Alexander
11b94026be Russian translation has been updated 2017-03-06 14:34:19 +03:00
Arin Alexander
ddc793f6e4 Merge branch '1.4'
# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h
2017-03-01 00:40:36 +03:00
Arin Alexander
e9957bd8b5 Russian translation has been updated 2017-02-28 23:23:33 +03:00
Arin Alexander
8c09e5ed51 Images has been changed 2016-11-05 00:37:33 +03:00
Arin Alexander
fecf863f7c Version 1.4 initial commit 2016-06-10 19:05:18 +04:00
newsages
1acaa431c4 ARCH_TYPE
unix{
    ARCH_DIR       = $${OUT_PWD}/unix
    ARCH_TYPE      = unix
    macx{
        ARCH_DIR       = $${OUT_PWD}/macx
        ARCH_TYPE      = macx
    }
    linux{
        !contains(QT_ARCH, x86_64){
            message("Compiling for 32bit system")
            ARCH_DIR       = $${OUT_PWD}/linux32
            ARCH_TYPE      = linux32
        }else{
            message("Compiling for 64bit system")
            ARCH_DIR       = $${OUT_PWD}/linux64
            ARCH_TYPE      = linux64
        }
    }
}
win32 {
    ARCH_DIR       = $${OUT_PWD}/win32
    ARCH_TYPE      = win32
}

DESTDIR  = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib

LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
2016-04-03 15:08:17 +02:00
Newsages
6133a9cd12 subdirs mkdir -p 2016-03-31 03:48:57 +02:00
Arin Alexander
0550654b04 Some limereport's project structure changes 2016-03-22 15:55:02 +03:00
Newsages
c9495b2745 Translations Español 2016-03-19 11:48:18 +01:00
Arin Alexander
45f3f9062a Russian translation has been fixed 2016-02-18 23:55:35 +03:00
Arin Alexander
62905e639a fix #4 В превью на русском языке выводится "Page 1 из 5" 2016-02-18 22:24:53 +03:00
Sergey Popovichev
9a792e453c 1.3.9 2016-02-17 10:39:17 +03:00
Sergey Popovichev
20fe567ab2 1.3.1 2016-02-17 10:28:27 +03:00