Merge branch 'master' into wip

Conflicts:
	Process.c
	Process.h
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	linux/LinuxProcessList.c
	unsupported/Platform.c
	unsupported/Platform.h
This commit is contained in:
Hisham Muhammad
2015-03-16 03:22:33 -03:00
4 changed files with 21 additions and 13 deletions

View File

@ -13,6 +13,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
#include "ProcessList.h"
#include "CRT.h"
#include "String.h"
#include "Platform.h"
#include <string.h>
#include <stdlib.h>