Changes between Version 94 and Version 95 of R1/Alpha4/MergeTracking

Timestamp:

Oct 29, 2012, 5:56:47 PM (12 years ago)

Author:

kallisti5

Comment:

ahci hrevr1alpha4-44654

R1/Alpha4/MergeTracking

@@ -70 +70 @@
 ||hrevr1alpha4-44630||localization||nielx|| || ||hrevr1alpha4-44630||
 ||'''hrev44691'''||'''stackandtile'''||'''czeidler'''|| || || ||
-||hrev44690||desklink||humdinger|| || ||hrevr1alpha4-44653||
+||hrev44690||desklink||humdinger||kallisti5|| ||hrevr1alpha4-44653||
 ||hrevr1alpha4-44629||localization||nielx|| || ||hrevr1alpha4-44629||
 ||hrev44689||ohci||x-ist||mmlr, kallisti5|| ||hrevr1alpha4-44643||
 ||hrev44688||udf||korli||kallisti5||hrev44711 a must (kdl fix)||hrevr1alpha4-44636||
-||hrev44687||desklink||humdinger|| || ||hrevr1alpha4-44653||
+||hrev44687||desklink||humdinger||kallisti5|| ||hrevr1alpha4-44653||
 ||hrevr1alpha4-44628||localization||nielx|| || ||hrevr1alpha4-44628||
 ||~~hrev44686~~||~~tracker~~||~~kallisti5~~||~~kallisti5~~||~~depends on hrev44673~~||-||
@@ -152 +152 @@
 ||hrev44641||vm||leavengood|| || ||hrevr1alpha4-44600||
 ||'''hrev44640'''||'''mkdos'''||'''marcusoverhagen'''|| || || ||
-||hrev44639||ahci||marcusoverhagen|| || || ||
-||'''hrev44638'''||'''ahci'''||'''marcusoverhagen'''|| || || ||
-||'''hrev44637'''||'''ahci'''||'''marcusoverhagen'''|| ||doesn't merge cleanly?|| ||
-||'''hrev44636'''||'''ahci'''||'''marcusoverhagen'''|| || || ||
+||hrev44639||ahci||marcusoverhagen||kallisti5|| may want to revert? see -dev ML ||hrevr1alpha4-44654||
+||hrev44638||ahci||marcusoverhagen||kallisti5|| ||hrevr1alpha4-44654||
+||hrev44637||ahci||marcusoverhagen||kallisti5|| ||hrevr1alpha4-44654||
+||hrev44636||ahci||marcusoverhagen||kallisti5|| ||hrevr1alpha4-44654||
 ||hrev44635||optional packages||scottmc||leavengood|| ||hrevr1alpha4-44600||
 ||hrevr1alpha4-44598||localization||nielx|| || ||hrevr1alpha4-44598||