--- - branch: christos-time_t date: Sun Jan 4 05:18:17 UTC 2009 files: - new: 1.115.2.2 old: 1.115.2.1 path: src/sys/arch/amd64/amd64/machdep.c pathrev: src/sys/arch/amd64/amd64/machdep.c@1.115.2.2 type: modified - new: 1.347.2.5 old: 1.347.2.4 path: src/sys/kern/init_main.c pathrev: src/sys/kern/init_main.c@1.347.2.5 type: modified - new: 1.335.2.7 old: 1.335.2.6 path: src/sys/kern/vfs_subr.c pathrev: src/sys/kern/vfs_subr.c@1.335.2.7 type: modified - new: 1.63.2.3 old: 1.63.2.2 path: src/sys/rump/librump/rumpkern/emul.c pathrev: src/sys/rump/librump/rumpkern/emul.c@1.63.2.3 type: modified - new: 1.65.8.5 old: 1.65.8.4 path: src/sys/ufs/ffs/ffs_snapshot.c pathrev: src/sys/ufs/ffs/ffs_snapshot.c@1.65.8.5 type: modified id: 20090104T051817Z.069975f21d20d1f62c8e52d0a7c3c1d09b6f57e4 log: "merge diffs.\n" module: src subject: 'CVS commit: [christos-time_t] src/sys' unixtime: '1231046297' user: christos