On 10/25/2013 5:17 PM, Endi Sukma Dewata wrote:
On 10/10/2013 8:54 AM, Endi Sukma Dewata wrote:
> The attached patches fix the dependency issues and reorganized the
> server packages into separate folders.
>
> Please apply in this order: 282, 283-1, 285-1, 325.
ACKed by Ade. Pushed to master.
Just a note, as mentioned above patch #325 changed the directory
structure. If you have not-yet-pushed changes based on the old directory
structure you should be able to cherry-pick them into master and it
should automatically merge the changes. Or if you have a patch file
based on the old directory structure you can use git am twice:
git am <patch> (it will fail first)
git am -3 (then it will merge the changes)
--
Endi S. Dewata