Merge branch 'origin/master'

spine-csharp/src/SkeletonData.cs

@@ -131,7 +131,7 @@ namespace Spine {
 		}
 
 		/// <returns>May be null.</returns>
-		public EventData findEvent (String eventDataName) {
+		public EventData FindEvent (String eventDataName) {
 			if (eventDataName == null) throw new ArgumentNullException("eventDataName cannot be null.");
 			foreach (EventData eventData in events)
 				if (eventData.Name == eventDataName) return eventData;

spine-csharp/src/SkeletonJson.cs

@@ -29,8 +29,8 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
+ *****************************************************************************/
+
 using System;
 using System.IO;
 using System.Collections.Generic;
@@ -354,7 +354,7 @@ namespace Spine {
 				EventTimeline timeline = new EventTimeline(eventsMap.Count);
 				int frameIndex = 0;
 				foreach (Dictionary<String, Object> eventMap in eventsMap) {
-					EventData eventData = skeletonData.findEvent((String)eventMap["name"]);
+					EventData eventData = skeletonData.FindEvent((String)eventMap["name"]);
 					if (eventData == null) throw new Exception("Event not found: " + eventMap["name"]);
 					Event e = new Event(eventData);
 					e.Int = GetInt(eventMap, "int", eventData.Int);
@@ -418,4 +418,4 @@ namespace Spine {
 			}
 		}
 	}
-}
+}