Merge branch 'JTA_Changes' of http://code.pepperdash.net/scm/pec/pepperdash-simplsharp-core into JTA_Changes

Browse Source

# Conflicts:
#	Pepperdash Core/CLZ Builds/PepperDash_Core.clz
#	Pepperdash Core/CLZ Builds/PepperDash_Core.dll
#	Pepperdash Core/Pepperdash Core.suo
#	Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs
#	Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo

...

This commit is contained in:

JTA

2017-07-30 14:36:40 -04:00

parent 632b2ea3b4 c206e4450a

commit 57af2aebb4

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

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

Diff Content Not Available