Arin Alexander c37a310918 Merge branch '1.4' into 1.4_QJSEngine ...

# Conflicts:
#	limereport/lritemdesignintf.cpp
#	limereport/lrreportrender.cpp
#	limereport/lrscriptenginemanager.cpp

2017-02-08 19:21:08 +03:00

..

demo_reports

Path to database has been fixed

2016-12-06 00:27:21 +03:00

images

Change to subforder project model.

2016-03-21 02:12:30 +01:00

demo_r1.pro

simplify DEST_BINS, DEST_LIBS

2016-04-03 15:33:41 +02:00

lr1.ico

Change to subforder project model.

2016-03-21 02:12:30 +01:00

lr6.ico

Change to subforder project model.

2016-03-21 02:12:30 +01:00

main.cpp

Change to subforder project model.

2016-03-21 02:12:30 +01:00

main.ico

Change to subforder project model.

2016-03-21 02:12:30 +01:00

mainicon.rc

Some limereport's project structure changes

2016-03-22 15:55:02 +03:00

mainwindow.cpp

Merge branch '1.4' into 1.4_QJSEngine

2017-02-08 19:21:08 +03:00

mainwindow.h

OneSlotDS has been added to demo_r1

2016-12-06 00:27:22 +03:00

mainwindow.ui

Change to subforder project model.

2016-03-21 02:12:30 +01:00

r1.qrc

Change to subforder project model.

2016-03-21 02:12:30 +01:00