Merge remote-tracking branch 'upstream/development' into development

Browse Source

Conflicts:
	.gitmodules

...

This commit is contained in:

Ishan Khanna 2015-03-04 02:31:39 +05:30

parent f3fd3c464c 568854f6dd

commit 3dda761791

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files