0xc0170
|
809d8aa82b
|
Squashed commit of the following (PR #1023):
commit 5390a0eb7fc28dda30993602652350fd0ad87df0
Merge: 7c4831f 3998966
Author: 0xc0170 <c0170@rocketmail.com>
Date: Thu Apr 23 08:48:31 2015 +0100
Merge branch 'master' of https://github.com/dudmuck/mbed into dudmuck-master
Conflicts:
workspace_tools/export/uvision4.py
commit 3998966b1b
Author: U-owner-PC\owner <Wayne Roberts>
Date: Thu Apr 9 13:45:09 2015 -0700
using defines for platform specific requirement
commit 755c5d9b07
Author: U-owner-PC\owner <Wayne Roberts>
Date: Wed Apr 8 14:59:47 2015 -0700
added device ID for MOTE_L152RC
commit d812fb0002
Merge: 6ad66e8 158cbeb
Author: U-owner-PC\owner <Wayne Roberts>
Date: Wed Apr 8 07:25:23 2015 -0700
Merge remote-tracking branch 'upstream/master'
commit 6ad66e89d8
Merge: 14a1807 cfb9dd1
Author: U-owner-PC\owner <Wayne Roberts>
Date: Fri Mar 27 15:54:03 2015 -0700
merged upstream
commit 14a18078ca
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Mar 24 10:01:02 2015 -0700
RTC subSeconds at 16384Hz
commit 32d75d04c1
Merge: bc84c03 ea01d61
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Mar 24 09:59:43 2015 -0700
Merge remote-tracking branch 'upstream/master'
commit bc84c03a37
Author: U-owner-PC\owner <Wayne Roberts>
Date: Mon Mar 16 16:26:18 2015 -0700
handle HSE-PLL enabled upone deepsleep wakeup
commit 11bfe693b9
Merge: b7cec55 fdc75bf
Author: U-owner-PC\owner <Wayne Roberts>
Date: Mon Mar 16 14:37:11 2015 -0700
Merge remote-tracking branch 'upstream/master'
commit b7cec55d08
Merge: c5b61f5 4b74c54
Author: U-owner-PC\owner <Wayne Roberts>
Date: Mon Mar 9 13:15:56 2015 -0700
syncd with upstream
commit c5b61f5c1d
Merge: c16a115 9d2fd3e
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Mar 3 14:05:54 2015 -0800
syncd with upstream
commit c16a115e18
Merge: 51efd61 1b2a621
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 24 09:48:55 2015 -0800
Merge remote-tracking branch 'upstream/master'
commit 51efd619f1
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 24 09:48:22 2015 -0800
MOTE_L152RC
commit a122226e46
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 24 09:46:08 2015 -0800
renamed SEMTECH_LORA915 to MOTE_L152RC
commit 88fcf53069
Merge: 3e291c1 8648ff5
Author: U-owner-PC\owner <Wayne Roberts>
Date: Mon Feb 23 08:11:48 2015 -0800
Merge remote-tracking branch 'upstream/master'
commit 3e291c1cce
Merge: a59aefc c9e93d2
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 17 19:04:04 2015 -0800
Merge remote-tracking branch 'upstream/master'
syncing my fork with master
commit a59aefc6ed
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 17 18:46:27 2015 -0800
added SEMTECH_LORA915 to python scripts
commit 15b1989b69
Author: U-owner-PC\owner <Wayne Roberts>
Date: Tue Feb 17 18:42:13 2015 -0800
added platform SEMTECH_LORA915
|
2015-04-23 08:55:29 +01:00 |
Christian Taedcke