[psycho commit] r412 - in trunk/Psycho: . src/Core/Psycho.Core src/Core/Psycho.Core/Psycho.Style src/Libraries/Te...

[codesite...@google.com]

Author: p.zurek
Date: Thu Sep 4 15:04:52 2008
New Revision: 412

Modified:
trunk/Psycho/.gitignore
trunk/Psycho/src/Core/Psycho.Core/.gitignore
trunk/Psycho/src/Core/Psycho.Core/Psycho.Style/StyleList.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs

Log:
Merge branch 'mumu'

* mumu:
I don't know why those changes are not commited.
Added the beggining of Teddy library (simple general purpose canvas)
Added the begginings of Teddy library (simple general purpose canvas)
Cosmetic change
Added references
Added a gitignore
Renamed all enum files to *Enum.cs
Added some wildcards to gitignore
Renamed all enum files to *Enum.cs
Added separate projects for Mumu.Data and Mumu.Geometry. Not sure if it's
the best idea as it would mean that the main class of Mumu library
(MindView) would go one level deep. We'll see.
Should be ignored
Changed the project type from executable to library.
Using wildcard to ignore pidb files. I hope it works that way.
Added Point class and interface
Added first Mumu library folders. No files yet.
No real change. No idea why Git marked the files as changed.
Final cleanup
Added the Mumu project. That will be the mind mapping library.
Moved ctor about properties.

Conflicts:

Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/ICanvas.cs

Modified: trunk/Psycho/.gitignore
==============================================================================
--- trunk/Psycho/.gitignore (original)
+++ trunk/Psycho/.gitignore Thu Sep 4 15:04:52 2008
@@ -1,2 +1,3 @@
-Psycho.userprefs
-Psycho.usertasks
+*.user*
+*.pidb
+bin
\ No newline at end of file

Modified: trunk/Psycho/src/Core/Psycho.Core/.gitignore
==============================================================================
--- trunk/Psycho/src/Core/Psycho.Core/.gitignore (original)
+++ trunk/Psycho/src/Core/Psycho.Core/.gitignore Thu Sep 4 15:04:52 2008
@@ -1,2 +1,4 @@
bin
+*.pidb
Psycho.Core.pidb
+Psycho.Properties

Modified: trunk/Psycho/src/Core/Psycho.Core/Psycho.Style/StyleList.cs
==============================================================================
--- trunk/Psycho/src/Core/Psycho.Core/Psycho.Style/StyleList.cs (original)
+++ trunk/Psycho/src/Core/Psycho.Core/Psycho.Style/StyleList.cs Thu Sep 4
15:04:52 2008
@@ -27,11 +27,11 @@
public class StyleList<T> : IStyleList<T>
where T : IStyle
{
- private List<T> list;
-
public StyleList () : base()
{
}
+
+ private List<T> list;

public void Add (T item)
{

Modified:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
==============================================================================
Binary files
/export/hds3/borgletdata/dirs/4.worktable2.workers.default.codesite.423533044/logs.4.worktable2.workers.default.codesite.423533044/tmp/tmpY0z5EA
and
/export/hds3/borgletdata/dirs/4.worktable2.workers.default.codesite.423533044/logs.4.worktable2.workers.default.codesite.423533044/tmp/tmpB3-ouD
differ