FIXED — StellarPad branch — Conflicting Batches of Files

[rei-vilo]

After commits 22f59d5 and 9326c0c from Revicore,

• #include "inc/hw_nvic.h" is gone again from after Energia.h
• analog pins names return to ANx instead of Ax— file pins_energia.h

Same happened after commit 0a2fea8

Revisore, please use the same batch of files to avoid conflicting batches of files.

The post Bug fix and new feature review process may help you.

Thank you.

[rei-vilo]

Thanks but all those commits are still impacted by last commit 3920d1d.

[rei-vilo]

Seems to be fixed now.

The lost examples are in commit Libraries and examples for Energia