merge test

This commit is contained in:
Laurent chretienneau 2012-09-28 14:41:50 +02:00
parent 2a56caa9c3
commit a53aa5c594

View file

@ -47,7 +47,7 @@ the CPAL as a work which combines Covered Code or portions thereof with code not
governed by the terms of the CPAL. However, in addition to the other notice governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on each distributed must, as a form of attribution of the original author, include on each
user interface screen the "OpenProj" and ÒProjectLibreÓ logos visible to all users. user interface screen the "OpenProj" and "ProjectLibre" logos visible to all users.
The OpenProj logo should be located horizontally aligned with the menu bar and left The OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu. The logo must be justified on the top left of the screen adjacent to the File menu. The logo must be
at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them
@ -68,9 +68,9 @@ the CPAL as a work which combines Covered Code or portions thereof with code not
governed by the terms of the CPAL. However, in addition to the other notice governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on each distributed must, as a form of attribution of the original author, include on each
user interface screen the "OpenProj" and ÒProjectLibreÓ logos visible to all users. user interface screen the "OpenProj" and "ProjectLibre" logos visible to all users.
The OpenProj logo should be located horizontally aligned with the menu bar and left The OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu. ÊThe logo must be justified on the top left of the screen adjacent to the File menu. The logo must be
at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them
back to http://www.projity.com. back to http://www.projity.com.
*/ */