15 Commits

Author	SHA1	Message	Date
vsr	bd2042b4d1	Merge branch 'V7_dev'	2016-03-24 16:36:53 +03:00
vsr	8370b4a1c4	Update copyright: 2016	2016-03-15 15:27:04 +03:00
vsr	fc8218a049	Updates from V7_dev branch	2016-02-19 16:45:33 +03:00
vsr	2a43dbcceb	Merge relevant changes from V8_0_0_BR branch	2016-02-15 17:37:33 +03:00
imn	f3c62a0c0b	Merge Qt5 porting.	2015-12-25 10:54:06 +03:00
akl	ff7fc4d6c2	Copyrights update 2015.	2015-02-10 13:25:20 +04:00
vsr	7961b83044	Revert "Synchronize adm files" ... This reverts commit 3cd92817cb.	2014-08-07 13:58:48 +04:00
Maintenance team (INV)	3cd92817cb	Synchronize adm files	2014-08-06 23:16:58 +04:00
akl	7d880c6a82	Update copyrights 2014.	2014-02-18 10:44:41 +04:00
eap	e7b562779c	CMake porting	2013-09-10 12:47:38 +00:00
eap	407cadd372	untabify	2013-06-17 12:15:50 +00:00
vsr	8fab12198b	Fix problem that user material database is not watched by resource manager when file is first time created.	2013-04-17 09:26:00 +00:00
vsr	5b3622aa23	Merge from V6_main 01/04/2013	2013-04-01 12:25:01 +00:00
vsr	465e84c52e	Merge from V6_main 11/02/2013	2013-02-12 11:35:16 +00:00
vsr	73555c78eb	Merge from V6_main_20120808 08Aug12	2012-08-09 07:58:02 +00:00