Jean-Paul Chaput 0182089511 Merge branch 'devel' ... Conflicts: alliance/src/ocp/src/common/Makefile.am alliance/src/ocp/src/placer/Makefile.am alliance/src/ppt/src/Makefile.am Devel was not started from the last master commit, have to push back the changes again...		2014-04-22 12:47:31 +02:00
alliance/src	Merge branch 'devel'	2014-04-22 12:47:31 +02:00
dev/scripts	This commit is only to test (try 16) the mailing list.	2014-02-22 16:04:51 +01:00
.gitignore	Merge branch 'devel'	2014-04-22 12:47:31 +02:00