Commit Graph

2 Commits

Author SHA1 Message Date
Renato Mangini
9ebc47d13e Merge branch 'removeSingleton' of https://github.com/beaufortfrancois/chrome-app-samples into beaufortfrancois-removeSingleton
Conflicts:
	README.md
	samples/singleton/README.md
	samples/singleton/assets/screenshot_1280_800.png
	samples/singleton/assets/screenshot_thumbnail.png
	samples/singleton/icon_128.png
	samples/singleton/icon_16.png
	samples/singleton/main.js
	samples/singleton/manifest.json
	samples/singleton/singleton.html
	samples/singleton/singleton.js
	samples/singleton/singleton.png
	samples/singleton/styles/main.css
2014-09-05 09:54:20 -03:00
François Beaufort
cf768bbcbd Restructured under new samples and libraries folders. 2014-09-02 18:06:16 +02:00