janishutz-legacy/impress.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict fix

Browse Source
This commit is contained in:
Bartek Szopka
2012-02-15 21:28:21 +01:00
parent c733c1ae38
commit 9f1ff58480
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -24,12 +24,10 @@ VERSION HISTORY
**CONTAINS UNRELEASED CHANGES, MAY BE UNSTABLE** **CONTAINS UNRELEASED CHANGES, MAY BE UNSTABLE**
<<<<<<< HEAD
* minor CSS 3D fixes * minor CSS 3D fixes
=======
* basic API to control the presentation flow from JavaScript * basic API to control the presentation flow from JavaScript
* touch event support * touch event support
>>>>>>> api
### 0.2 ([browse](http://github.com/bartaz/impress.js/tree/0.2), [zip](http://github.com/bartaz/impress.js/zipball/0.2), [tar](http://github.com/bartaz/impress.js/tarball/0.2)) ### 0.2 ([browse](http://github.com/bartaz/impress.js/tree/0.2), [zip](http://github.com/bartaz/impress.js/zipball/0.2), [tar](http://github.com/bartaz/impress.js/tarball/0.2))