Merge branch 'master' of https://github.com/OpenXRay/xray-16

Author: Pavel Kovalenko

doc/design/tasks.txt

@@ -94,15 +94,16 @@ STALKER_2010: Andrew Boyarshin
 
 awdavies: Andrew Davies
 - project general
-	* Get rid of deprecation compiler warnings.
+  * Get rid of deprecation compiler warnings.
+  * Remove macro redefinitions.
 - engine
-	- multithreading (order listed is order of completion).
-		- research
-			- Determine where multithreading could benefit potential performance bottlenecks.
-			- Examine bottlenecks with profiler.  Document results.
-			- Designate which tasks should be assigned to which cores.
-		- implementation (edit as research gets closer to completion for more accurate plan).
-			- Include library capable of creating light-weight kernel-visible threads.
-			- Abstract specific tasks to certain cores.
-			- Add thread pool/scheduler for tasks.
-			- Run profiler again (might need to find one capable of tracking multiple threads).
+  - multithreading (order listed is order of completion).
+    - research
+      - Determine where multithreading could benefit potential performance bottlenecks.
+      - Examine bottlenecks with profiler.  Document results.
+      - Designate which tasks should be assigned to which cores.
+    - implementation (edit as research gets closer to completion for more accurate plan).
+      - Include library capable of creating light-weight kernel-visible threads.
+      - Abstract specific tasks to certain cores.
+      - Add thread pool/scheduler for tasks.
+      - Run profiler again (might need to find one capable of tracking multiple threads).