Skip to content

Commit

Permalink
Merge pull request #72 from CreatorKit/dev
Browse files Browse the repository at this point in the history
Merge dev to master
  • Loading branch information
nikhil-zinjurde-imgtec authored Jul 7, 2016
2 parents aa2ff39 + 352ab83 commit 67a8385
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion creator-kit-1-cascoda.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CONFIG_TARGET_pistachio=y
CONFIG_TARGET_pistachio_marduk=y
CONFIG_TARGET_pistachio_marduk_marduk_ca8210=y
CONFIG_PACKAGE_led-controller=y
CONFIG_PACKAGE_button-led-controller=y
CONFIG_PACKAGE_webscripts=y
CONFIG_IMAGEOPT=y
CONFIG_VERSIONOPT=y
Expand Down
2 changes: 1 addition & 1 deletion creator-kit-1.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CONFIG_TARGET_pistachio=y
CONFIG_TARGET_pistachio_marduk=y
CONFIG_TARGET_pistachio_marduk_marduk_cc2520=y
CONFIG_PACKAGE_led-controller=y
CONFIG_PACKAGE_button-led-controller=y
CONFIG_PACKAGE_webscripts=y
CONFIG_IMAGEOPT=y
CONFIG_VERSIONOPT=y
Expand Down

0 comments on commit 67a8385

Please sign in to comment.