| commit | 0b8beb68f1c7dc81b7f886a10fabfa86abbbfb33 | |
| author | Jiri Palecek <jirka@debian.(none)> | |
| Thu, 7 Jan 2010 14:41:03 +0000 (7 15:41 +0100) | ||
| committer | Jiri Palecek <jirka@debian.(none)> | |
| Thu, 7 Jan 2010 14:41:03 +0000 (7 15:41 +0100) | ||
| tree | 643e54ead4445b6588158de0b12f3fb93a8454f9 | treesnapshot (tar.gz zip) |
| parent | 267ccf8432cb8e2b41cb9dc97759b453253d01f5 | commitdiff |
| parent | 03ad8e4c34e5403d016aa60d0e47d97cb5f0ab9b | commitdiff |
Merge branch 'dfsg_clean'
Conflicts:
include/mk/automake.mk
runtest/commands
runtest/fs
runtest/syscalls
testcases/commands/ade/Makefile
testcases/commands/ade/ld/ld01
testcases/commands/ade/ldd/ldd01
testcases/commands/ade/nm/nm01
testcases/commands/ade/objdump/Makefile
testcases/commands/ade/objdump/objdump01
testcases/commands/unzip/Makefile
testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
testcases/misc/math/float/thread_code.c
testcases/network/tcp_cmds/echo/echo01
testcases/network/tcp_cmds/tcpdump/tcpdump01
testcases/realtime/Makefile
Conflicts:
include/mk/automake.mk
runtest/commands
runtest/fs
runtest/syscalls
testcases/commands/ade/Makefile
testcases/commands/ade/ld/ld01
testcases/commands/ade/ldd/ldd01
testcases/commands/ade/nm/nm01
testcases/commands/ade/objdump/Makefile
testcases/commands/ade/objdump/objdump01
testcases/commands/unzip/Makefile
testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
testcases/misc/math/float/thread_code.c
testcases/network/tcp_cmds/echo/echo01
testcases/network/tcp_cmds/tcpdump/tcpdump01
testcases/realtime/Makefile
15 files changed: