ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix several incorrect comments (refering to the wrong file).

Browse source
This commit is contained in:
Stefan Kangas 2010-12-24 02:21:31 +01:00
parent a6fd1ec6fd
commit 74fce587bd
6 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/model/clip-track.hpp
View file

@ -20,7 +20,7 @@
*/
/**
* @file widgets/timeline/clip-track.hpp
* @file model/clip-track.hpp
* This file contains the definition of timeline track objects which
* contain clips.
*/

4
src/gui/model/clip.cpp
View file

@ -1,6 +1,6 @@
/*
timeline-track.cpp - Implementation of the timeline clip object
clip.cpp - Implementation of the Clip object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>

9
src/gui/model/clip.hpp
View file

@ -1,5 +1,5 @@
/*
timeline-clip.hpp - Declaration of the timeline clip object
clip.hpp - Definition of the Clip class
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -19,8 +19,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file widgets/timeline/timeline-clip.hpp
** This file contains the definition of timeline clip object
/** @file model/clip.hpp
** This file contains the definition of the Clip object
*/
#ifndef CLIP_HPP
@ -32,6 +32,9 @@ namespace model {
class Clip
{
public:
/**
* Constructor
**/
Clip();
};

5
src/gui/widgets/timeline/timeline-body.cpp
View file

@ -1,6 +1,11 @@
/*
<<<<<<< HEAD
timeline.cpp - Implementation of the timeline widget
=======
timeline-body.cpp - Implementation of the timeline body widget
>>>>>>> Fix several incorrect comments (refering to the wrong file).
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>

4
src/gui/widgets/timeline/timeline-clip.cpp
View file

@ -1,6 +1,6 @@
/*
timeline-track.cpp - Implementation of the timeline clip object
timeline-clip.cpp - Implementation of the timeline clip object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>

4
src/gui/widgets/timeline/timeline-view-window.cpp
View file

@ -1,6 +1,6 @@
/*
timeline-window.hpp - Implementation of the timeline window object
timeline-view-window.hpp - Implementation of the timeline window object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>