Commit e75b9172b8ac430de02f81c806028e6bf10f37ba

arvind
Wed Jun 13 10:16:36 IST 2012

Tree SHA1: 6267e03
Parent SHA1: 132dcaf (Removing conflict)
raw diff | raw patch

Merging from development

.gitignore 3 -++

Diff rendering mode:
inline
side by side

.gitignore


1	*.png	1	*.png
2	.~	2	.~
		3	*.xml