forked from BobZhome/android_vendor_cm
-
Notifications
You must be signed in to change notification settings - Fork 3
/
DEADJOE
76 lines (68 loc) · 1.93 KB
/
DEADJOE
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
*** These modified files were found in JOE when it aborted on Wed May 23 04:15:09 2012
*** JOE was aborted by UNIX signal 15
*** File '.git/COMMIT_EDITMSG'
*** These modified files were found in JOE when it aborted on Wed May 23 04:15:09 2012
*** JOE was aborted by UNIX signal 15
*** These modified files were found in JOE when it aborted on Wed May 23 04:15:09 2012
*** JOE was aborted by UNIX signal 15
Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into ics
Conflicts:
config/common.mk
config/permissions/com.tmobile.software.themes.xml
vendorsetup.sh
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
#
fix merge
*** File '(Unnamed)'
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch ics
# Changes to be committed:
#
# modified: CHANGELOG.mkdn
# modified: config/common.mk
# modified: config/permissions/com.tmobile.software.themes.xml
# new file: overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hu/main.dict
# new file: prebuilt/common/bootanimation/vertical-800x1280.zip
# modified: tools/squisher
# modified: vendorsetup.sh
#
*** File '(Unnamed)'
*** File '(Unnamed)'
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG
.git/COMMIT_EDITMSG