openttd-ottdgrfs: projects/openttd.tgt@cda5ffec8999 (annotated)

5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1	40
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2	targetIdent
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	3	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	4	MProject
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	5	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	6	MComponent
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	7	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	8	2
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	9	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	10	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	11	OEXE
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	12	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	13	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	14	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	15	op2en
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	16	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	17	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	18	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	19	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	20	MCommand
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	21	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	22	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	23	MCommand
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	24	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	25	6
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	26	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	27	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	28	openttd.exe
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	29	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	30	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	31	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	32	OEXE
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	33	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	34	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	35	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	36	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	37	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	38	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	39	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	40	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	41	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	42	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	43	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	44	25
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	45	?????No debug information
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	46	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	47	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	48	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	49	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	50	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	51	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	52	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	53	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	54	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	55	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	56	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	57	?????Debug All
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	58	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	59	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	60	15
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	61	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	62	16
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	63	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	64	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	65	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	66	17
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	67	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	68	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	69	?????Stack:
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	70	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	71	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	72	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	73	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	74	2097152
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	75	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	76	19
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	77	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	78	20
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	79	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	80	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	81	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	82	21
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	83	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	84	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	85	?????Libraries(,):
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	86	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	87	22
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	88	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	89	24
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	90	png.lib zlib.lib sdl.lib
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	91	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	92	23
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	93	MCState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	94	24
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	95	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	96	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	97	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	98	25
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	99	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	100	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	101	?????Map file
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	102	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	103	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	104	26
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	105	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	106	27
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	107	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	108	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	109	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	110	28
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	111	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	112	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	113	?????Stack:
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	114	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	115	29
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	116	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	117	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	118	4194304
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	119	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	120	30
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	121	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	122	31
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	123	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	124	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	125	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	126	32
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	127	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	128	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	129	?????Libraries(,):
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	130	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	131	33
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	132	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	133	34
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	134	mmpm2.lib png.lib zlib.lib sdl.lib
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	135	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	136	34
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	137	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	138	35
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	139	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	140	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	141	OS2LINK
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	142	36
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	143	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	144	17
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	145	o????Description:
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	146	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	147	37
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	148	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	149	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	150	OpenTTD
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	151	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	152	38
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	153	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	154	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	155	39
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	156	ActionStates
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	157	40
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	158	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	159	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	160	&Make
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	161	41
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	162	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	163	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	164	42
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	165	ActionStates
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	166	43
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	167	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	168	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	169	&Run
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	170	44
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	171	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	172	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	173	45
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	174	ActionStates
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	175	46
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	176	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	177	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	178	Sam&ple
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	179	47
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	180	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	181	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	182	-1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	183	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	184	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	185	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	186	48
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	187	WPickList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	188	127
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	189	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	190	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	191	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	192	*.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	193	50
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	194	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	195	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	196	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	197	51
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	198	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	199	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	200	52
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	201	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	202	53
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	203	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	204	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	205	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	206	54
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	207	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	208	28
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	209	?????Disable Warning message
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	210	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	211	55
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	212	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	213	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	214	202
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	215	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	216	56
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	217	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	218	57
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	219	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	220	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	221	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	222	58
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	223	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	224	23
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	225	?????Macro definitions:
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	226	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	227	59
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	228	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	229	50
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	230	ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	231	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	232	60
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	233	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	234	61
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	235	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	236	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	237	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	238	62
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	239	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	240	21
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	241	?????4 byte alignment
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	242	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	243	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	244	63
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	245	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	246	64
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	247	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	248	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	249	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	250	65
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	251	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	252	21
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	253	?????No optimizations
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	254	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	255	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	256	66
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	257	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	258	67
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	259	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	260	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	261	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	262	68
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	263	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	264	24
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	265	?????Space optimizations
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	266	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	267	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	268	69
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	269	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	270	70
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	271	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	272	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	273	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	274	71
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	275	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	276	29
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	277	?????No debugging information
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	278	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	279	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	280	72
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	281	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	282	73
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	283	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	284	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	285	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	286	74
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	287	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	288	24
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	289	?????Full debugging info
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	290	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	291	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	292	75
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	293	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	294	76
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	295	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	296	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	297	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	298	77
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	299	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	300	28
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	301	?????Disable Warning message
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	302	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	303	78
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	304	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	305	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	306	202
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	307	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	308	79
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	309	MVState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	310	80
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	311	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	312	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	313	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	314	81
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	315	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	316	23
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	317	?????Macro definitions:
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	318	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	319	82
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	320	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	321	61
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	322	ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 WITH_REV=1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	323	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	324	83
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	325	MCState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	326	84
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	327	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	328	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	329	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	330	85
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	331	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	332	31
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	333	?????Force enums to be type int
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	334	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	335	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	336	86
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	337	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	338	87
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	339	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	340	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	341	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	342	88
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	343	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	344	29
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	345	?????No debugging information
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	346	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	347	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	348	89
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	349	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	350	90
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	351	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	352	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	353	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	354	91
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	355	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	356	28
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	357	?????Line number information
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	358	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	359	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	360	92
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	361	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	362	93
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	363	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	364	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	365	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	366	94
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	367	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	368	39
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	369	??2??Pentium Pro Register based calling
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	370	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	371	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	372	95
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	373	MRState
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	374	96
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	375	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	376	3
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	377	WCC
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	378	97
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	379	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	380	36
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	381	??2??Pentium Pro Stack based calling
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	382	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	383	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	384	98
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	385	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	386	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	387	-1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	388	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	389	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	390	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	391	99
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	392	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	393	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	394	ai\ai.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	395	100
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	396	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	397	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	398	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	399	101
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	400	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	401	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	402	102
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	403	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	404	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	405	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	406	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	407	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	408	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	409	103
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	410	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	411	20
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	412	ai\default\default.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	413	104
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	414	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	415	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	416	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	417	105
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	418	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	419	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	420	106
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	421	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	422	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	423	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	424	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	425	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	426	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	427	107
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	428	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	429	17
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	430	ai\trolly\build.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	431	108
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	432	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	433	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	434	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	435	109
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	436	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	437	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	438	110
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	439	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	440	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	441	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	442	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	443	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	444	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	445	111
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	446	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	447	22
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	448	ai\trolly\pathfinder.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	449	112
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	450	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	451	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	452	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	453	113
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	454	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	455	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	456	114
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	457	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	458	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	459	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	460	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	461	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	462	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	463	115
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	464	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	465	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	466	ai\trolly\shared.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	467	116
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	468	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	469	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	470	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	471	117
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	472	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	473	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	474	118
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	475	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	476	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	477	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	478	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	479	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	480	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	481	119
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	482	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	483	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	484	ai\trolly\trolly.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	485	120
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	486	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	487	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	488	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	489	121
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	490	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	491	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	492	122
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	493	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	494	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	495	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	496	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	497	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	498	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	499	123
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	500	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	501	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	502	aircraft_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	503	124
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	504	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	505	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	506	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	507	125
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	508	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	509	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	510	126
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	511	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	512	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	513	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	514	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	515	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	516	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	517	127
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	518	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	519	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	520	aircraft_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	521	128
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	522	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	523	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	524	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	525	129
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	526	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	527	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	528	130
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	529	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	530	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	531	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	532	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	533	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	534	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	535	131
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	536	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	537	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	538	airport.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	539	132
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	540	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	541	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	542	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	543	133
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	544	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	545	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	546	134
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	547	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	548	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	549	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	550	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	551	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	552	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	553	135
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	554	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	555	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	556	airport_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	557	136
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	558	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	559	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	560	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	561	137
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	562	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	563	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	564	138
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	565	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	566	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	567	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	568	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	569	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	570	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	571	139
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	572	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	573	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	574	aystar.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	575	140
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	576	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	577	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	578	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	579	141
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	580	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	581	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	582	142
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	583	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	584	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	585	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	586	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	587	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	588	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	589	143
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	590	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	591	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	592	bridge_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	593	144
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	594	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	595	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	596	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	597	145
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	598	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	599	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	600	146
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	601	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	602	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	603	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	604	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	605	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	606	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	607	147
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	608	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	609	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	610	bridge_map.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	611	148
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	612	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	613	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	614	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	615	149
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	616	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	617	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	618	150
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	619	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	620	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	621	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	622	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	623	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	624	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	625	151
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	626	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	627	16
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	628	callback_table.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	629	152
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	630	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	631	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	632	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	633	153
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	634	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	635	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	636	154
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	637	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	638	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	639	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	640	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	641	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	642	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	643	155
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	644	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	645	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	646	clear_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	647	156
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	648	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	649	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	650	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	651	157
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	652	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	653	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	654	158
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	655	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	656	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	657	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	658	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	659	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	660	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	661	159
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	662	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	663	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	664	command.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	665	160
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	666	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	667	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	668	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	669	161
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	670	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	671	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	672	162
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	673	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	674	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	675	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	676	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	677	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	678	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	679	163
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	680	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	681	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	682	console.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	683	164
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	684	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	685	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	686	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	687	165
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	688	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	689	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	690	166
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	691	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	692	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	693	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	694	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	695	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	696	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	697	167
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	698	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	699	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	700	console_cmds.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	701	168
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	702	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	703	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	704	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	705	169
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	706	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	707	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	708	170
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	709	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	710	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	711	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	712	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	713	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	714	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	715	171
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	716	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	717	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	718	currency.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	719	172
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	720	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	721	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	722	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	723	173
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	724	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	725	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	726	174
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	727	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	728	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	729	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	730	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	731	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	732	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	733	175
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	734	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	735	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	736	debug.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	737	176
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	738	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	739	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	740	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	741	177
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	742	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	743	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	744	178
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	745	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	746	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	747	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	748	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	749	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	750	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	751	179
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	752	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	753	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	754	dedicated.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	755	180
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	756	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	757	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	758	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	759	181
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	760	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	761	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	762	182
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	763	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	764	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	765	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	766	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	767	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	768	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	769	183
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	770	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	771	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	772	depot.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	773	184
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	774	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	775	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	776	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	777	185
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	778	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	779	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	780	186
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	781	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	782	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	783	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	784	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	785	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	786	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	787	187
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	788	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	789	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	790	disaster_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	791	188
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	792	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	793	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	794	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	795	189
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	796	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	797	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	798	190
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	799	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	800	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	801	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	802	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	803	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	804	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	805	191
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	806	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	807	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	808	dock_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	809	192
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	810	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	811	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	812	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	813	193
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	814	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	815	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	816	194
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	817	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	818	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	819	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	820	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	821	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	822	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	823	195
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	824	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	825	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	826	driver.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	827	196
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	828	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	829	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	830	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	831	197
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	832	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	833	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	834	198
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	835	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	836	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	837	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	838	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	839	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	840	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	841	199
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	842	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	843	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	844	dummy_land.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	845	200
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	846	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	847	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	848	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	849	201
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	850	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	851	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	852	202
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	853	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	854	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	855	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	856	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	857	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	858	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	859	203
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	860	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	861	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	862	economy.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	863	204
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	864	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	865	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	866	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	867	205
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	868	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	869	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	870	206
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	871	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	872	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	873	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	874	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	875	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	876	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	877	207
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	878	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	879	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	880	elrail.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	881	208
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	882	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	883	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	884	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	885	209
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	886	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	887	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	888	210
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	889	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	890	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	891	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	892	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	893	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	894	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	895	211
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	896	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	897	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	898	engine.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	899	212
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	900	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	901	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	902	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	903	213
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	904	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	905	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	906	214
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	907	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	908	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	909	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	910	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	911	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	912	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	913	215
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	914	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	915	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	916	engine_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	917	216
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	918	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	919	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	920	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	921	217
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	922	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	923	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	924	218
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	925	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	926	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	927	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	928	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	929	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	930	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	931	219
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	932	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	933	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	934	fileio.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	935	220
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	936	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	937	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	938	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	939	221
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	940	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	941	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	942	222
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	943	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	944	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	945	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	946	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	947	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	948	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	949	223
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	950	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	951	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	952	gfx.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	953	224
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	954	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	955	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	956	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	957	225
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	958	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	959	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	960	226
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	961	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	962	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	963	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	964	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	965	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	966	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	967	227
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	968	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	969	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	970	gfxinit.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	971	228
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	972	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	973	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	974	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	975	229
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	976	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	977	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	978	230
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	979	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	980	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	981	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	982	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	983	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	984	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	985	231
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	986	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	987	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	988	graph_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	989	232
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	990	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	991	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	992	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	993	233
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	994	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	995	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	996	234
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	997	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	998	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	999	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1000	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1001	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1002	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1003	235
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1004	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1005	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1006	industry_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1007	236
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1008	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1009	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1010	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1011	237
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1012	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1013	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1014	238
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1015	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1016	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1017	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1018	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1019	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1020	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1021	239
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1022	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1023	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1024	industry_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1025	240
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1026	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1027	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1028	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1029	241
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1030	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1031	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1032	242
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1033	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1034	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1035	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1036	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1037	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1038	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1039	243
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1040	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1041	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1042	intro_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1043	244
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1044	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1045	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1046	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1047	245
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1048	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1049	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1050	246
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1051	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1052	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1053	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1054	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1055	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1056	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1057	247
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1058	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1059	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1060	landscape.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1061	248
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1062	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1063	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1064	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1065	249
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1066	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1067	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1068	250
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1069	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1070	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1071	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1072	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1073	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1074	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1075	251
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1076	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1077	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1078	main_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1079	252
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1080	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1081	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1082	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1083	253
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1084	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1085	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1086	254
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1087	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1088	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1089	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1090	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1091	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1092	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1093	255
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1094	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1095	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1096	map.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1097	256
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1098	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1099	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1100	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1101	257
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1102	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1103	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1104	258
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1105	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1106	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1107	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1108	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1109	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1110	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1111	259
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1112	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1113	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1114	md5.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1115	260
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1116	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1117	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1118	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1119	261
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1120	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1121	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1122	262
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1123	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1124	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1125	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1126	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1127	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1128	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1129	263
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1130	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1131	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1132	mersenne.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1133	264
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1134	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1135	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1136	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1137	265
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1138	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1139	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1140	266
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1141	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1142	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1143	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1144	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1145	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1146	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1147	267
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1148	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1149	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1150	minilzo.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1151	268
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1152	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1153	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1154	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1155	269
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1156	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1157	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1158	270
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1159	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1160	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1161	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1162	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1163	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1164	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1165	271
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1166	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1167	6
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1168	misc.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1169	272
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1170	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1171	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1172	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1173	273
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1174	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1175	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1176	274
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1177	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1178	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1179	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1180	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1181	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1182	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1183	275
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1184	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1185	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1186	misc_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1187	276
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1188	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1189	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1190	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1191	277
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1192	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1193	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1194	278
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1195	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1196	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1197	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1198	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1199	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1200	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1201	279
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1202	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1203	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1204	misc_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1205	280
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1206	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1207	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1208	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1209	281
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1210	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1211	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1212	282
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1213	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1214	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1215	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1216	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1217	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1218	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1219	283
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1220	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1221	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1222	mixer.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1223	284
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1224	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1225	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1226	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1227	285
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1228	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1229	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1230	286
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1231	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1232	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1233	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1234	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1235	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1236	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1237	287
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1238	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1239	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1240	music\null_m.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1241	288
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1242	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1243	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1244	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1245	289
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1246	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1247	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1248	290
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1249	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1250	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1251	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1252	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1253	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1254	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1255	291
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1256	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1257	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1258	music\os2_m.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1259	292
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1260	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1261	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1262	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1263	293
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1264	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1265	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1266	294
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1267	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1268	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1269	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1270	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1271	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1272	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1273	295
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1274	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1275	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1276	music_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1277	296
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1278	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1279	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1280	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1281	297
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1282	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1283	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1284	298
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1285	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1286	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1287	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1288	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1289	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1290	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1291	299
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1292	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1293	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1294	namegen.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1295	300
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1296	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1297	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1298	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1299	301
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1300	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1301	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1302	302
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1303	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1304	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1305	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1306	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1307	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1308	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1309	303
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1310	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1311	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1312	network.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1313	304
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1314	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1315	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1316	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1317	305
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1318	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1319	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1320	306
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1321	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1322	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1323	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1324	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1325	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1326	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1327	307
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1328	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1329	16
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1330	network_client.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1331	308
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1332	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1333	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1334	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1335	309
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1336	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1337	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1338	310
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1339	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1340	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1341	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1342	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1343	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1344	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1345	311
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1346	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1347	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1348	network_data.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1349	312
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1350	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1351	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1352	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1353	313
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1354	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1355	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1356	314
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1357	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1358	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1359	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1360	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1361	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1362	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1363	315
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1364	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1365	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1366	network_gamelist.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1367	316
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1368	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1369	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1370	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1371	317
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1372	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1373	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1374	318
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1375	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1376	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1377	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1378	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1379	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1380	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1381	319
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1382	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1383	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1384	network_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1385	320
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1386	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1387	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1388	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1389	321
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1390	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1391	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1392	322
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1393	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1394	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1395	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1396	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1397	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1398	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1399	323
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1400	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1401	16
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1402	network_server.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1403	324
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1404	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1405	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1406	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1407	325
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1408	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1409	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1410	326
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1411	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1412	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1413	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1414	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1415	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1416	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1417	327
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1418	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1419	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1420	network_udp.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1421	328
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1422	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1423	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1424	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1425	329
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1426	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1427	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1428	330
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1429	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1430	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1431	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1432	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1433	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1434	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1435	331
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1436	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1437	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1438	newgrf.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1439	332
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1440	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1441	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1442	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1443	333
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1444	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1445	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1446	334
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1447	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1448	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1449	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1450	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1451	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1452	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1453	335
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1454	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1455	15
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1456	newgrf_engine.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1457	336
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1458	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1459	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1460	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1461	337
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1462	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1463	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1464	338
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1465	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1466	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1467	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1468	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1469	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1470	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1471	339
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1472	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1473	16
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1474	newgrf_station.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1475	340
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1476	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1477	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1478	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1479	341
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1480	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1481	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1482	342
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1483	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1484	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1485	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1486	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1487	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1488	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1489	343
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1490	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1491	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1492	news_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1493	344
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1494	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1495	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1496	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1497	345
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1498	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1499	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1500	346
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1501	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1502	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1503	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1504	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1505	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1506	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1507	347
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1508	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1509	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1510	npf.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1511	348
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1512	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1513	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1514	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1515	349
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1516	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1517	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1518	350
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1519	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1520	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1521	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1522	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1523	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1524	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1525	351
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1526	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1527	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1528	oldloader.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1529	352
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1530	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1531	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1532	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1533	353
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1534	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1535	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1536	354
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1537	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1538	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1539	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1540	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1541	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1542	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1543	355
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1544	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1545	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1546	openttd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1547	356
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1548	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1549	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1550	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1551	357
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1552	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1553	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1554	358
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1555	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1556	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1557	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1558	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1559	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1560	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1561	359
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1562	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1563	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1564	order_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1565	360
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1566	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1567	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1568	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1569	361
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1570	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1571	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1572	362
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1573	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1574	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1575	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1576	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1577	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1578	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1579	363
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1580	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1581	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1582	order_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1583	364
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1584	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1585	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1586	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1587	365
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1588	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1589	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1590	366
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1591	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1592	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1593	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1594	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1595	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1596	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1597	367
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1598	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1599	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1600	os2.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1601	368
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1602	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1603	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1604	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1605	369
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1606	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1607	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1608	370
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1609	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1610	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1611	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1612	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1613	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1614	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1615	371
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1616	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1617	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1618	os_timer.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1619	372
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1620	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1621	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1622	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1623	373
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1624	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1625	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1626	374
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1627	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1628	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1629	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1630	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1631	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1632	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1633	375
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1634	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1635	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1636	pathfind.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1637	376
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1638	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1639	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1640	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1641	377
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1642	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1643	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1644	378
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1645	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1646	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1647	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1648	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1649	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1650	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1651	379
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1652	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1653	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1654	player_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1655	380
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1656	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1657	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1658	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1659	381
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1660	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1661	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1662	382
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1663	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1664	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1665	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1666	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1667	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1668	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1669	383
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1670	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1671	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1672	players.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1673	384
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1674	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1675	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1676	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1677	385
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1678	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1679	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1680	386
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1681	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1682	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1683	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1684	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1685	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1686	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1687	387
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1688	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1689	6
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1690	oldpool.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1691	388
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1692	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1693	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1694	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1695	389
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1696	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1697	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1698	390
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1699	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1700	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1701	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1702	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1703	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1704	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1705	391
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1706	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1707	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1708	queue.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1709	392
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1710	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1711	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1712	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1713	393
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1714	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1715	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1716	394
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1717	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1718	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1719	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1720	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1721	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1722	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1723	395
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1724	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1725	6
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1726	rail.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1727	396
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1728	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1729	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1730	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1731	397
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1732	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1733	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1734	398
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1735	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1736	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1737	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1738	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1739	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1740	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1741	399
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1742	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1743	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1744	rail_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1745	400
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1746	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1747	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1748	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1749	401
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1750	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1751	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1752	402
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1753	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1754	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1755	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1756	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1757	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1758	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1759	403
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1760	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1761	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1762	rail_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1763	404
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1764	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1765	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1766	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1767	405
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1768	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1769	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1770	406
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1771	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1772	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1773	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1774	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1775	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1776	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1777	407
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1778	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1779	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1780	rev.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1781	408
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1782	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1783	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1784	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1785	409
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1786	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1787	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1788	410
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1789	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1790	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1791	411
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1792	ActionStates
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1793	412
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1794	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1795	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1796	&Make
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1797	413
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1798	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1799	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1800	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1801	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1802	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1803	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1804	414
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1805	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1806	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1807	road_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1808	415
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1809	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1810	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1811	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1812	416
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1813	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1814	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1815	417
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1816	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1817	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1818	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1819	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1820	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1821	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1822	418
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1823	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1824	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1825	road_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1826	419
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1827	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1828	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1829	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1830	420
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1831	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1832	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1833	421
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1834	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1835	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1836	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1837	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1838	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1839	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1840	422
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1841	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1842	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1843	road_map.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1844	423
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1845	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1846	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1847	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1848	424
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1849	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1850	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1851	425
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1852	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1853	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1854	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1855	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1856	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1857	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1858	426
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1859	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1860	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1861	roadveh_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1862	427
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1863	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1864	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1865	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1866	428
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1867	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1868	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1869	429
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1870	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1871	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1872	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1873	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1874	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1875	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1876	430
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1877	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1878	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1879	roadveh_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1880	431
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1881	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1882	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1883	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1884	432
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1885	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1886	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1887	433
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1888	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1889	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1890	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1891	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1892	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1893	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1894	434
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1895	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1896	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1897	saveload.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1898	435
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1899	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1900	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1901	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1902	436
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1903	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1904	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1905	437
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1906	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1907	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1908	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1909	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1910	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1911	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1912	438
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1913	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1914	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1915	screenshot.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1916	439
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1917	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1918	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1919	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1920	440
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1921	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1922	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1923	441
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1924	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1925	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1926	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1927	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1928	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1929	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1930	442
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1931	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1932	5
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1933	sdl.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1934	443
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1935	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1936	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1937	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1938	444
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1939	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1940	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1941	445
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1942	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1943	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1944	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1945	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1946	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1947	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1948	446
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1949	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1950	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1951	settings.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1952	447
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1953	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1954	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1955	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1956	448
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1957	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1958	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1959	449
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1960	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1961	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1962	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1963	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1964	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1965	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1966	450
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1967	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1968	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1969	settings_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1970	451
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1971	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1972	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1973	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1974	452
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1975	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1976	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1977	453
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1978	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1979	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1980	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1981	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1982	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1983	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1984	454
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1985	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1986	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1987	ship_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1988	455
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1989	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1990	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1991	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1992	456
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1993	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1994	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1995	457
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1996	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1997	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1998	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1999	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2000	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2001	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2002	458
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2003	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2004	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2005	ship_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2006	459
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2007	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2008	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2009	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2010	460
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2011	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2012	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2013	461
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2014	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2015	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2016	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2017	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2018	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2019	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2020	462
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2021	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2022	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2023	signs.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2024	463
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2025	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2026	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2027	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2028	464
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2029	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2030	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2031	465
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2032	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2033	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2034	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2035	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2036	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2037	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2038	466
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2039	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2040	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2041	smallmap_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2042	467
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2043	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2044	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2045	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2046	468
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2047	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2048	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2049	469
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2050	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2051	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2052	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2053	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2054	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2055	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2056	470
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2057	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2058	7
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2059	sound.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2060	471
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2061	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2062	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2063	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2064	472
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2065	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2066	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2067	473
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2068	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2069	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2070	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2071	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2072	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2073	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2074	474
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2075	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2076	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2077	sound\null_s.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2078	475
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2079	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2080	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2081	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2082	476
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2083	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2084	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2085	477
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2086	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2087	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2088	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2089	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2090	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2091	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2092	478
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2093	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2094	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2095	sound\sdl_s.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2096	479
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2097	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2098	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2099	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2100	480
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2101	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2102	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2103	481
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2104	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2105	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2106	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2107	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2108	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2109	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2110	482
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2111	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2112	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2113	sprite.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2114	483
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2115	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2116	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2117	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2118	484
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2119	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2120	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2121	485
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2122	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2123	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2124	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2125	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2126	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2127	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2128	486
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2129	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2130	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2131	spritecache.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2132	487
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2133	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2134	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2135	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2136	488
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2137	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2138	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2139	489
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2140	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2141	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2142	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2143	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2144	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2145	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2146	490
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2147	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2148	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2149	station_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2150	491
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2151	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2152	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2153	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2154	492
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2155	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2156	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2157	493
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2158	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2159	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2160	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2161	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2162	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2163	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2164	494
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2165	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2166	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2167	station_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2168	495
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2169	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2170	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2171	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2172	496
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2173	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2174	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2175	497
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2176	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2177	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2178	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2179	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2180	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2181	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2182	498
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2183	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2184	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2185	station_map.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2186	499
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2187	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2188	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2189	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2190	500
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2191	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2192	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2193	501
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2194	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2195	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2196	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2197	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2198	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2199	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2200	502
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2201	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2202	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2203	StdAfx.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2204	503
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2205	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2206	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2207	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2208	504
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2209	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2210	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2211	505
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2212	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2213	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2214	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2215	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2216	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2217	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2218	506
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2219	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2220	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2221	string.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2222	507
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2223	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2224	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2225	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2226	508
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2227	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2228	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2229	509
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2230	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2231	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2232	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2233	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2234	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2235	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2236	510
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2237	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2238	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2239	strings.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2240	511
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2241	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2242	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2243	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2244	512
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2245	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2246	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2247	513
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2248	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2249	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2250	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2251	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2252	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2253	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2254	514
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2255	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2256	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2257	subsidy_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2258	515
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2259	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2260	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2261	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2262	516
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2263	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2264	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2265	517
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2266	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2267	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2268	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2269	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2270	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2271	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2272	518
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2273	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2274	15
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2275	terraform_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2276	519
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2277	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2278	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2279	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2280	520
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2281	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2282	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2283	521
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2284	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2285	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2286	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2287	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2288	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2289	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2290	522
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2291	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2292	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2293	texteff.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2294	523
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2295	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2296	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2297	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2298	524
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2299	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2300	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2301	525
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2302	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2303	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2304	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2305	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2306	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2307	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2308	526
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2309	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2310	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2311	thread.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2312	527
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2313	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2314	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2315	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2316	528
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2317	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2318	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2319	529
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2320	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2321	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2322	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2323	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2324	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2325	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2326	530
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2327	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2328	6
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2329	tile.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2330	531
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2331	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2332	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2333	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2334	532
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2335	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2336	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2337	533
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2338	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2339	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2340	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2341	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2342	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2343	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2344	534
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2345	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2346	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2347	town_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2348	535
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2349	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2350	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2351	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2352	536
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2353	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2354	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2355	537
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2356	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2357	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2358	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2359	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2360	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2361	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2362	538
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2363	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2364	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2365	town_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2366	539
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2367	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2368	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2369	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2370	540
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2371	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2372	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2373	541
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2374	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2375	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2376	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2377	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2378	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2379	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2380	542
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2381	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2382	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2383	train_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2384	543
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2385	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2386	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2387	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2388	544
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2389	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2390	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2391	545
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2392	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2393	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2394	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2395	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2396	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2397	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2398	546
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2399	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2400	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2401	train_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2402	547
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2403	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2404	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2405	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2406	548
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2407	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2408	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2409	549
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2410	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2411	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2412	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2413	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2414	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2415	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2416	550
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2417	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2418	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2419	tree_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2420	551
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2421	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2422	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2423	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2424	552
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2425	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2426	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2427	553
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2428	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2429	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2430	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2431	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2432	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2433	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2434	554
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2435	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2436	12
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2437	tunnel_map.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2438	555
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2439	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2440	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2441	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2442	556
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2443	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2444	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2445	557
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2446	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2447	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2448	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2449	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2450	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2451	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2452	558
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2453	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2454	18
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2455	tunnelbridge_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2456	559
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2457	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2458	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2459	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2460	560
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2461	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2462	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2463	561
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2464	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2465	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2466	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2467	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2468	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2469	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2470	562
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2471	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2472	15
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2473	unmovable_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2474	563
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2475	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2476	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2477	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2478	564
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2479	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2480	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2481	565
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2482	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2483	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2484	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2485	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2486	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2487	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2488	566
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2489	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2490	9
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2491	vehicle.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2492	567
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2493	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2494	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2495	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2496	568
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2497	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2498	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2499	569
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2500	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2501	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2502	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2503	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2504	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2505	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2506	570
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2507	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2508	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2509	vehicle_gui.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2510	571
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2511	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2512	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2513	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2514	572
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2515	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2516	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2517	573
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2518	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2519	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2520	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2521	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2522	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2523	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2524	574
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2525	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2526	19
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2527	video\dedicated_v.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2528	575
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2529	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2530	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2531	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2532	576
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2533	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2534	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2535	577
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2536	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2537	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2538	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2539	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2540	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2541	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2542	578
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2543	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2544	14
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2545	video\null_v.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2546	579
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2547	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2548	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2549	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2550	580
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2551	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2552	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2553	581
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2554	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2555	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2556	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2557	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2558	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2559	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2560	582
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2561	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2562	13
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2563	video\sdl_v.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2564	583
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2565	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2566	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2567	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2568	584
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2569	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2570	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2571	585
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2572	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2573	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2574	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2575	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2576	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2577	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2578	586
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2579	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2580	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2581	viewport.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2582	587
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2583	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2584	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2585	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2586	588
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2587	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2588	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2589	589
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2590	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2591	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2592	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2593	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2594	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2595	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2596	590
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2597	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2598	11
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2599	water_cmd.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2600	591
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2601	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2602	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2603	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2604	592
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2605	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2606	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2607	593
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2608	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2609	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2610	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2611	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2612	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2613	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2614	594
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2615	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2616	10
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2617	waypoint.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2618	595
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2619	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2620	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2621	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2622	596
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2623	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2624	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2625	597
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2626	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2627	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2628	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2629	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2630	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2631	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2632	598
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2633	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2634	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2635	widget.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2636	599
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2637	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2638	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2639	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2640	600
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2641	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2642	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2643	601
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2644	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2645	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2646	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2647	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2648	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2649	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2650	602
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2651	MItem
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2652	8
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2653	window.c
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2654	603
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2655	WString
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2656	4
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2657	COBJ
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2658	604
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2659	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2660	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2661	605
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2662	WVList
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2663	0
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2664	49
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2665	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2666	1
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2667	0

author	bjarni
	Sat, 08 Dec 2007 15:21:37 +0000
changeset 8535	cda5ffec8999
parent 5726	8f399788f6c9
permissions	-rw-r--r--