Mercurial Mercurial > leezam / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client/player/src/js/header.js
author wakimd
Wed, 22 Dec 2010 12:01:05 +0100
changeset 25 c8dfd7ea87e5
parent 9 22ab430e9b64
permissions -rw-r--r--
Corrections on merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     1
 
/*
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     2
 
 *
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     3
 
 *	Copyright 2010 Institut de recherche et d'innovation
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     4
 
 *	contributor(s) : Samuel Huron
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     5
 
 *
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     6
 
 *	contact@iri.centrepompidou.fr
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     7
 
 *	http://www.iri.centrepompidou.fr
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     8
 
 *
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
     9
 
 *	This software is a computer program whose purpose is to show and add annotations on a video .
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    10
 
 *	This software is governed by the CeCILL-C license under French law and
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    11
 
 *	abiding by the rules of distribution of free software. You can  use,
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    12
 
 *	modify and/ or redistribute the software under the terms of the CeCILL-C
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    13
 
 *	license as circulated by CEA, CNRS and INRIA at the following URL
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    14
 
 *	"http://www.cecill.info".
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    15
 
 *
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    16
 
 *	The fact that you are presently reading this means that you have had
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    17
 
 *	knowledge of the CeCILL-C license and that you accept its terms.
22ab430e9b64 Corrections on models and general structure
wakimd
parents:
diff changeset 
    18
 
*/
leezam