Astro/tutorial.depend.orig at master · ProjectChaos/Astro · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
# depslib dependency file v1.0
<<<<<<< HEAD
1379594593 source:c:\users\johannes\documents\workspacec++\astro\hello.cpp
	<iostream>

1382351825 source:c:\users\johannes\documents\workspacec++\astro\main.cpp
=======
1379598193 source:c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\hello.cpp
	<iostream>

1382355425 source:c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\main.cpp
>>>>>>> origin/master
	<iostream>
	<conio.h>
	<math.h>
	<sstream>
	<string>
	<stdlib.h>
	"Koord.h"
	"Planet.h"
	"hello.h"

<<<<<<< HEAD
1384170093 c:\users\johannes\documents\workspacec++\astro\include\koord.h

1384170093 c:\users\johannes\documents\workspacec++\astro\include\planet.h
	<string>
	"Koord.h"

1379594546 c:\users\johannes\documents\workspacec++\astro\include\hello.h

1384170093 source:c:\users\johannes\documents\workspacec++\astro\src\koord.cpp
	"Koord.h"

1384170093 source:c:\users\johannes\documents\workspacec++\astro\src\planet.cpp
=======
1384167526 c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\include\koord.h

1384171724 c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\include\planet.h
	<string>
	"Koord.h"

1379598146 c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\include\hello.h

1384167554 source:c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\src\koord.cpp
	"Koord.h"

1384171922 source:c:\users\philipp\dropbox\jo astro projekt\project files\philipp commit\src\planet.cpp
	"Planet.h"

1379598193 source:c:\users\philipp\workspacec++\astro2\hello.cpp
	<iostream>

1384172044 source:c:\users\philipp\workspacec++\astro2\main.cpp
	<iostream>
	<conio.h>
	<math.h>
	<sstream>
	<string>
	<stdlib.h>
	"Koord.h"
	"Planet.h"
	"hello.h"

1384167526 c:\users\philipp\workspacec++\astro2\include\koord.h

1384171724 c:\users\philipp\workspacec++\astro2\include\planet.h
	<string>
	"Koord.h"

1379598146 c:\users\philipp\workspacec++\astro2\include\hello.h

1384167554 source:c:\users\philipp\workspacec++\astro2\src\koord.cpp
	"Koord.h"

1384171922 source:c:\users\philipp\workspacec++\astro2\src\planet.cpp
>>>>>>> origin/master
	"Planet.h"