OSDN Git Service
(root)
/
android-x86
/
external-e2fsprogs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4f1d0e8
bf3941a
)
Merge branch 'maint' into next
author
Theodore Ts'o
<tytso@mit.edu>
Sun, 2 Aug 2009 00:43:00 +0000
(20:43 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Sun, 2 Aug 2009 00:43:00 +0000
(20:43 -0400)
Conflicts:
misc/Makefile.in
1
2
misc/Makefile.in
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
misc/Makefile.in
index
5f5dab5
,
3076f67
..
5d9af4d
---
1
/
misc/Makefile.in
---
2
/
misc/Makefile.in
+++ b/
misc/Makefile.in
@@@
-50,7
-50,7
+50,8
@@@
FSCK_OBJS= fsck.o base_device.o ismount
BLKID_OBJS= blkid.o
FILEFRAG_OBJS= filefrag.o
E2UNDO_OBJS= e2undo.o
+E4DEFRAG_OBJS= e4defrag.o
+ E2FREEFRAG_OBJS= e2freefrag.o
PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o
PROFILED_MKLPF_OBJS= profiled/mklost+found.o
OSDN Git Service
