Merge branch 'master' into notification-service
[iotivity.git] / .gitignore
2016-07-11 uzchoiMerge branch 'master' into notification-service 69/9269/1
2016-07-01 David AntlerMerge branch 'windows-port' 41/8441/20
2016-06-16 Hun-je YeonMerge branch 'master' into notification-service 09/8709/1
2016-06-15 David AntlerMerge branch 'master' into windows-port 45/8645/6
2016-06-15 Hun-je YeonMerge branch 'master' into notification-service 61/8661/1
2016-06-13 David AntlerMerge branch 'master' into windows-port 29/8629/2
2016-06-13 HUN-JE YEONUpdate .gitignore for notification service 13/8613/2
2016-06-06 David AntlerMerge branch 'master' into windows-port 01/8501/1
2016-06-02 David AntlerMerge branch 'master' into windows-port 35/8435/1
2016-06-02 David AntlerVS2013/15 aggregate changes of Intel and Microsoft 27/7627/71
2016-02-29 Markus JungMerge branch 'resource-container' 39/5239/2
2016-02-26 Jee Hyeok KimMerge branch 'master' into cloud-interface 37/5137/9
2016-02-19 lankamadanMerge "Merge branch 'master' into easysetup" into easysetup
2016-02-19 lankamadanMerge branch 'master' into easysetup 69/5069/1
2016-02-03 Jihun HaMerge branch 'master' into group-manager 15/4915/1
2015-12-18 G S Senthil KumarMerge branch 'master' into simulator. 61/4661/1
2015-12-02 YounghyunJooRemove extlibs/expat for removing the PPM 91/4391/2
2015-09-20 Habib VirjiUpdate RD with latest master 95/2795/1
2015-09-10 Mandeep ShettyMerge branch 'master' into ra.to.merge 36/2436/1
2015-09-01 G S Senthil KumarMerge branch 'master' into simulator 30/2330/1
2015-08-31 Sachin AgrawalMerge branch 'master' into 'security-CKM' branch 26/2326/1
2015-08-27 Vinil JainMerge branch 'master' into easysetup & CBOR changes 04/2304/1
2015-08-26 Hauke Mehrtensandroid: fix location of sdk 22/1222/6
2015-08-05 Sachin AgrawalMerge branch 'master' into 'security-basecamp' 13/2113/1
2015-08-03 Sachin AgrawalMerge branch 'master' into 'security-CKM' branch. 88/2088/2
2015-08-03 Harish Kumara MarappaMerge branch 'master' into simulator 86/1986/2
2015-07-31 Ossama OthmanImplemented Linux BLE transport. 25/1125/73
2015-07-16 hunje.yeonMerge branch 'master' into resource-manipulation 83/1683/1
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR 74/1674/1
2015-07-14 Omkar HegdeCBOR rebase onto master for merge/review 13/1613/12
2015-07-10 hunje.yeonMerge branch 'master' into resource-manipulation 16/1616/1
2015-07-10 Sachin AgrawalUpdated gitignore to ignore dependencies folder 15/1615/3
2015-06-24 hunje.yeonMerge branch 'master' into resource-manipulation 11/1411/1
2015-06-23 Madan LankaMerge branch 'master' into easysetup and fixed OCStack... 92/1392/2
2015-06-22 Ossama OthmanMake git ignore libraries and tinydtls binaries. 85/1385/2 single-thread
2015-06-21 Ossama OthmanAdded Valgrind generated "*.memcheck" files to the... 70/1370/3
2015-06-11 hunje.yeonMerge branch 'master' into resource-manipulation 41/1241/1
2015-06-08 hyuna0213.joAdd proguard-project.txt to the .gitignore file 96/1196/5
2015-06-04 hunje.yeonMerge branch 'master' into resource-manipulation 88/1188/1
2015-06-03 Madan LankaMerge branch 'master' into easysetup 79/1179/1
2015-05-26 Thiago MacieiraUpdate .gitignore to ignore *.orig files too 01/1101/2
2015-05-19 Harish Kumara MarappaProject files for importing the Tizen sample applications 51/951/3
2015-05-15 Tim KourtAndroid Base API merge to master 94/894/11
2015-04-15 Thuyen TranAdded hook to unit test when build: darwin. 07/707/7
2015-04-10 Erich KeaneMerge branch 'connectivity-abstraction' to master 92/692/20
2015-03-11 Joseph MorrowAdded SCons support for Arduino platform. 31/431/9
2015-03-10 Ossama OthmanUpdated external library paths to be ignored by git. 57/457/2
2015-02-18 OssamaAutomatically detect C++11 flags for supported compilers. 40/240/13
2015-02-02 Erich KeaneAltered the .gitignore to properly ignore unittest... 80/280/4
2014-12-25 Sudarshan PrasadMerge "scons changes for connectivity-abstraction branc...
2014-12-24 Sudarshan PrasadMerge "Updates occlientbasicops to include (resource...
2014-12-24 Sudarshan PrasadMerge "[CA-Integration] fix for presence." into connect...
2014-12-23 Sudarshan PrasadMerge "Remove the dead code" into connectivity-abstraction
2014-12-23 Sudarshan PrasadMerge from master to connectivity-abstraction branch 25/25/1
2014-12-20 William DieterDownload gtest-1.7.0 rather than depending on it being... 06/6/2
2014-12-20 sudarshan prasadMerge "Fixing delete issue in device discovery server...
2014-12-19 sudarshan prasadMerge "Replaced sprintf with snprintf in the sdk to...
2014-12-19 Patrick LankswertMerge changes Ie4233a5c,I4d7aba08
2014-12-18 Ossama OthmanIgnore SCons generated files and directories.
2014-12-17 sudarshan prasadMerge "Added code to send close_notify alert when OC...
2014-12-16 sudarshan prasadMerge "Fixed server crash on empty client payload"
2014-12-16 sudarshan prasadMerge "Fixed UnitTest crash when getting JSON from...
2014-12-15 Uze ChoiMerge "There are Two modifications. 1. Restucturing...
2014-12-13 sudarshan prasadMerge "Fixed IOT-110--Crash on destruction"
2014-12-11 sudarshan prasadMerge "Implementation of connectivity abstraction featu...
2014-12-11 Sudarshan PrasadMerge branch 'master' into connectivity-abstraction
2014-12-11 Patrick LankswertMerge "Update build scripts"
2014-12-11 Uze ChoiMerge "Added Plugin Manager Configuration Feature ...
2014-12-11 sudarshan prasadMerge "Updated the .gitignore"
2014-12-10 Erich KeaneUpdated the .gitignore
2014-12-08 Sudarshan PrasadMerge branch 'master' into connectivity-abstraction
2014-12-05 sudarshan prasadMerge "Implement functionality to set PSK credentials...
2014-12-02 sudarshan prasadMerge "Implemented JSON Serialization using Cereal...
2014-12-01 Erich KeaneImplemented JSON Serialization using Cereal Library
2014-10-01 Erich KeaneMerge "1 Bug fix to check for length of uri and query...
2014-10-01 William DieterMerge "C++ programer's guide"
2014-10-01 Erich KeaneMerge "Added URI parameter for Device Entity Handler."
2014-09-30 Erich KeaneMerge "Modified makefiles so that each makefile could...
2014-09-30 Thuyen TranModified makefiles so that each makefile could build...
2014-09-15 Erich KeaneMerge "Updated Arduino sample app to reflect the curren...
2014-09-11 Erich KeaneMerge "Revert "Doxygen run for *.h files""
2014-09-11 Erich KeaneMerge "Doxygen run for *.h files"
2014-09-11 Erich KeaneMerge "Add .gitignore file"
2014-09-11 Thiago MacieiraAdd .gitignore file