projects / platform / upstream / nspr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57df9d0 518c7d1)
Merge remote-tracking branch 'review.tizen.org/tizen' into tizen accepted/tizen/generic accepted/tizen/ivi/stable accepted/tizen/mobile accepted/tizen_generic accepted/tizen_ivi_panda accepted/tizen_ivi_release tizen_3.0.m14.2_ivi tizen_ivi_release accepted/tizen/generic/20140106.140344 accepted/tizen/generic/20140108.092332 accepted/tizen/generic/20140312.115929 accepted/tizen/ivi/20140106.203829 accepted/tizen/ivi/panda/20140312.115807 accepted/tizen/ivi/release/20140312.121314 accepted/tizen/mobile/20140107.213300 submit/tizen/20140103.214915 submit/tizen/20140108.022419 submit/tizen/20140312.070852 submit/tizen_ivi_release/20140108.030119 submit/tizen_ivi_release/20140312.071324 tizen_3.0.m14.2_ivi_release
authorMichael Demeter <michael.demeter@intel.com>
Fri, 3 Jan 2014 21:41:23 +0000 (13:41 -0800)
committerMichael Demeter <michael.demeter@intel.com>
Fri, 3 Jan 2014 21:41:23 +0000 (13:41 -0800)
Signed-off-by: Michael Demeter <michael.demeter@intel.com>
Conflicts:
packaging/nspr.spec

Change-Id: I9c496af417c8255e96fe236ee9015fc9cee6aa2b


Trivial merge
Domain: Security / Utilities;