Merge branch 'master' of github.com:saqibmasood/Aspose_Imaging_Java

saqibmasood · saqibmasood · commit fec206b74717 · 2015-09-21T09:52:08.000+05:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,19 @@
+# Eclipse project files
+.classpath
+.project
+.settings/
+test-output/
+
+# IntelliJ project files
+.idea/
+*.iws
+*.iml
+*.ipr
 
+# Mac
+.DS_Store
+
+# Others
 Temp/
 obj/
 classes/
@@ -8,9 +23,6 @@ bin/
 * out*
 *.ldb
 _ReSharper*/
-*.iws
-*.iml
-*.ipr
 *.eml
 out/
 *.user
@@ -23,7 +35,5 @@ Thumbs.db
 manifest.mf
 Out/
 Out*/
-.settings/
 *.lic
 Data/*Out*
-.idea/
diff --git a/Examples/README.md b/Examples/README.md
@@ -4,4 +4,4 @@ This directory contains Java code examples for [Aspose.Imaging for Java](http://
 
 ## How to use the examples?
 
-Use your favourite IDE to open/import the project. Read our [documentation](http://www.aspose.com/docs/display/imagingjava) for more details.
+Use your favourite Java IDE to open/import the project. Read our [documentation](http://www.aspose.com/docs/display/imagingjava/How+to+Use+the+Examples) for more details.

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ This directory contains Java code examples for [Aspose.Imaging for Java](http://`
`4`	`4`
`5`	`5`	`## How to use the examples?`
`6`	`6`
`7`		`-Use your favourite IDE to open/import the project. Read our [documentation](http://www.aspose.com/docs/display/imagingjava) for more details.`
	`7`	`+Use your favourite Java IDE to open/import the project. Read our [documentation](http://www.aspose.com/docs/display/imagingjava/How+to+Use+the+Examples) for more details.`