User:Andre Castro: Difference between revisions

@@ Line 5: / Line 5: @@
 ==quick links==
-[http://pzwart3.wdka.hro.nl/wiki/Calendars:Networked_Media_Calendar NM-calendar]
-[http://pzwart3.wdka.hro.nl/wiki/Prototyping_NM Prototyping]
-[http://pzwart3.wdka.hro.nl/wiki/Archive_%26_Memory Archive & Memory]
 [http://pzwart3.wdka.hro.nl/wiki/Reading,_Writing_%26_Research_Methodologies_2011/2012 Writing & Research]
 [http://pzwart3.wdka.hro.nl/wiki/My_TP_is_happy_(template) TP is happy]
-[http://pzwart3.wdka.hro.nl/wiki/Factory_Reset Factory Reset]
-[[Media:Data-factory-f2.ogv]]
@@ Line 23: / Line 18: @@
 [[Andre Castro, StreetMapName, 2011]]
-==<span style="color:#00000;background-color:#FF3366;margin-top:20px;">3rd trimester </span>==
+----
+==<span style="color:#00000;background-color:#FF3366;margin-top:20px;">Year 2 - 1st trimester </span>==
+[[User:Andre_Castro/2.1/research-Categories-interests | Research: categories & interests ]]
+==<span style="color:#00000;background-color:#FF3366;margin-top:20px;">Year 1 - 3rd trimester </span>==
 ===<span style="color:#00000;background-color:#FF3366;margin-top:20px;font-weight:bold">Thematic Project - Factory Reset</span>===
 http://andrecastro.info/data-factory/
+[[Media:Data-factory-f2.ogv]]
 [[User:Andre_Castro/FactoryReset/1.3/DataFactory_Transmedial | transmedial application]]

Revision as of 19:29, 23 September 2012