diff options
| author | Craig Small <csmall@enc.com.au> | 2011-12-26 09:11:27 +1100 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2011-12-26 09:11:27 +1100 |
| commit | a99002e3feaefcec3a5cf975e4b13b74f2db2f03 (patch) | |
| tree | 8dbe25e1d51f22f08c749dc0f739edd429037177 /.gitignore | |
| parent | 46e51c92e615afd18aa70bf35c64c2e659396b7a (diff) | |
| parent | 2983b305235bb6ed5a22e0a397fce5078b2cb63c (diff) | |
| download | procps-ng-a99002e3feaefcec3a5cf975e4b13b74f2db2f03.tar.gz | |
Merge branch 'master' into nls
Conflicts:
configure.ac
pmap.c
ps/Makefile.am
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -32,8 +32,8 @@ pkill pmap procps-ng-*.tar.gz proc/.depend -proc/libprocfs.la -proc/libprocfs.pc +proc/libprocps.la +proc/libprocps.pc proc/Makefile proc/Makefile.in ps/Makefile |