6 Commits (58b81a2590e1e8f12feb34428ad411ab4c9142ef)

Author	SHA1	Message	Date
Kim Kulling	b19ebf5d54	Fix merge conflicts.	2020-07-14 09:02:14 +02:00
Kim Kulling	77b705048b	fix merge issues.	2020-07-04 13:42:23 +02:00
Kim Kulling	b1369d0912	next steps.	2020-07-02 15:18:59 +02:00
Kim Kulling	6205af4efb	replace NULL and avoid ai_assert with more than 2 tests.	2020-06-23 21:05:42 +02:00
Kim Kulling	2be731d1bf	Merge branch 'master' into pugi_xml	2020-05-22 10:09:46 +02:00
Kim Kulling	f8e6512a63	Move format importer and exporter into its won folder.	2020-05-02 15:14:38 +02:00