4 Commits

Author	SHA1	Message	Date
Mathieu Malaterre	2643f79069	Another set of change to remove warnings about c style comments	2011-12-16 11:26:26 +00:00
Mickael Savinaud	1dc6eddf1c	backport rev 1013-1014 from trunk	2011-10-19 15:45:03 +00:00
Mickael Savinaud	5213675ba8	correct nightly crash on all platform linked to merge operation and missing opj_getopt command	2011-09-02 09:00:58 +00:00
Antonin Descampe	9a89e2f162	backport r898 to r907 in openjpeg-1.5 branch	2011-09-01 12:08:10 +00:00