opencv/modules/java/android/AndroidManifest.xml

<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.opencv"
      android:versionCode="240"
      android:versionName="2.4.0">
</manifest>
Android samples fixed - line endings are converted to unix style; autogenerated folders are added to ignore list 2011-06-29 21:42:46 +08:00			`<?xml version="1.0" encoding="utf-8"?>`
			`<manifest xmlns:android="http://schemas.android.com/apk/res/android"`
			`package="org.opencv"`
merged 2.4 into trunk 2012-04-30 22:33:52 +08:00			`android:versionCode="240"`
			`android:versionName="2.4.0">`
Android samples fixed - line endings are converted to unix style; autogenerated folders are added to ignore list 2011-06-29 21:42:46 +08:00			`</manifest>`