LenaSYS

Merge lp:~wikxen/lenasys/fixedHierarchy into lp:~henrik-gustavsson/lenasys/trunk

  1. fixedHierarchy
  2. Merge into trunk
Proposed by Erik Wikström
Status: Needs review
Proposed branch: lp:~wikxen/lenasys/fixedHierarchy
Merge into: lp:~henrik-gustavsson/lenasys/trunk
Diff against target: 40 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~wikxen/lenasys/fixedHierarchy
Reviewer Review Type Date Requested Status
Gustav Hartvigsson (community) Disapprove
Review via email: mp+156011@code.launchpad.net

Description of the change

Fixed the hierarchy and removed .DS_Store

To post a comment you must log in.
Revision history for this message
Gustav Hartvigsson (gustav-hartvigsson) :
review: Disapprove
Reply

Unmerged revisions

6. By Erik Wikström

removed .DS_Store

5. By Erik Wikström

Removed trunk folder and moved its contents to the root

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory 'trunk/Code Tokenizer and Parser' => 'Code Tokenizer and Parser'
2=== renamed directory 'trunk/Code Viewer Alt' => 'Code Viewer Alt'
3=== renamed directory 'trunk/CodeViewer' => 'CodeViewer'
4=== renamed directory 'trunk/DuggaSys' => 'DuggaSys'
5=== renamed directory 'trunk/ErModeller' => 'ErModeller'
6=== renamed directory 'trunk/ObjConv' => 'ObjConv'
7=== renamed directory 'trunk/WebGL and Benchmarking' => 'WebGL and Benchmarking'
8=== renamed directory 'trunk/Widget Library' => 'Widget Library'
9=== renamed directory 'trunk/svg Converter' => 'svg Converter'
10=== removed directory 'trunk'
11=== removed file 'trunk/.DS_Store'
12Binary files trunk/.DS_Store 2013-03-26 23:42:29 +0000 and trunk/.DS_Store 1970-01-01 00:00:00 +0000 differ
13=== removed file 'trunk/Code Viewer Alt/.DS_Store'
14Binary files trunk/Code Viewer Alt/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/Code Viewer Alt/.DS_Store 1970-01-01 00:00:00 +0000 differ
15=== removed file 'trunk/CodeViewer/.DS_Store'
16Binary files trunk/CodeViewer/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/CodeViewer/.DS_Store 1970-01-01 00:00:00 +0000 differ
17=== removed file 'trunk/CodeViewer/Codeviewer/.DS_Store'
18Binary files trunk/CodeViewer/Codeviewer/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/CodeViewer/Codeviewer/.DS_Store 1970-01-01 00:00:00 +0000 differ
19=== removed file 'trunk/CodeViewer/DomExample3b/.DS_Store'
20Binary files trunk/CodeViewer/DomExample3b/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/CodeViewer/DomExample3b/.DS_Store 1970-01-01 00:00:00 +0000 differ
21=== removed file 'trunk/DuggaSys/.DS_Store'
22Binary files trunk/DuggaSys/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/.DS_Store 1970-01-01 00:00:00 +0000 differ
23=== removed file 'trunk/DuggaSys/duggor/.DS_Store'
24Binary files trunk/DuggaSys/duggor/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/.DS_Store 1970-01-01 00:00:00 +0000 differ
25=== removed file 'trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/.DS_Store'
26Binary files trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/.DS_Store 1970-01-01 00:00:00 +0000 differ
27=== removed file 'trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/.DS_Store'
28Binary files trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/.DS_Store 1970-01-01 00:00:00 +0000 differ
29=== removed file 'trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/.DS_Store'
30Binary files trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/.DS_Store 1970-01-01 00:00:00 +0000 differ
31=== removed file 'trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/.DS_Store'
32Binary files trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/.DS_Store 1970-01-01 00:00:00 +0000 differ
33=== removed file 'trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/.DS_Store'
34Binary files trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/.DS_Store 1970-01-01 00:00:00 +0000 differ
35=== removed file 'trunk/DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/.DS_Store'
36Binary files trunk/DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/.DS_Store 1970-01-01 00:00:00 +0000 differ
37=== removed file 'trunk/DuggaSys/quizSystem/.DS_Store'
38Binary files trunk/DuggaSys/quizSystem/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/quizSystem/.DS_Store 1970-01-01 00:00:00 +0000 differ
39=== removed file 'trunk/DuggaSys/quizSystem/data/.DS_Store'
40Binary files trunk/DuggaSys/quizSystem/data/.DS_Store 2013-03-26 23:22:55 +0000 and trunk/DuggaSys/quizSystem/data/.DS_Store 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: