labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed method identified by Static Analyzer as violating ObjC N-A-R-C memory management rules regarding method names.

Method contained string "new", but didn't return an object with +1 retain count.

Recall: if a method contains any of these substrings ["New", "Alloc", "Retain", "Copy"], regardless of case, then the method must return an object with retain count +1.

Choosing a different substring fixed the unintended conflict.
Upgrade yaml version to that required by UberFire
Sharebox added
SWF-1856 : Git migration announce
SWF-1856 : Display posts on homepage
SWF-1856 : Git migration announce
Merge branch 'feature/git-documentations'
SWF-1856 : Fix post title
SWF-1856 : Customize the list of posts
Merge branch 'feature/design'
Merge branch 'feature/git-documentations'
SWF-1856 : Use rdiscount to render markdown to avoid errors like "REXML could not parse this XML/HTML"
change from README file to README.md file.
Fix for spec that relies on hashes being in insertion order, not true in Ruby 1.8.
adding nuget reference to readme
AssetViewer: Menu working + directory browser UI working
Added a comment on the order.
only output tagline in navigation when requested
removed leftovers of template shared with events
delete concurrent tset
merge
-a
Merge pull request #6 from AndrewKahn/master

Added/Fixed insert.sql script.
Added images representing the fudge dice. They are now correctly displayed too.
first commit
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
test commit
added snapshot suffix
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
adding SNAPSHOT suffix
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
initial import
adding SNAPSHOT  suffix
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
[maven-release-plugin] rollback the release of suite-test-groups-publisher-1.0
changing scm location
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
dding snapshot suffix
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
adding SNAPSHOT suffix
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
adding snapshot suffix
refactoring
[maven-release-plugin] prepare release suite-test-groups-publisher-1.0
switching themes to responsive, css tweaks and styles"
switching datatypes for postgres
Bump module version to 0.0.3

Signed-off-by: CaptPants <captpants@kickstand-project.org>
adding utilities for dynamodb
Merge branch 'master' of github.com:kurianw/CervezaInternacionalConverter
pushing items
Merge branch 'master' of github.com:kurianw/CervezaInternacionalConverter
tokenizing succesfully, trying to parse into objects properly
Lockscreen VolCtrls : Don't raise volume on skipTrack

Set mIsLongPress to true when longpress was successful to avoid
volume from being changed on release

Change-Id: I874f7d66248e30535dddfec53ddd299718e3fa3d
Quick Settings Pulldown: Left or Right side option (1/2)

Patch set 2 : Fix defaults from upgrading
Patch set 3 : Change percentages

Change-Id: I1f74043865e2670430da7c90ddc8aacc8e5267be
Quick Settings: Add Network mode tile (part 1 of 2)

Tile drawables credit to Bjorn Lunden

Patchset 1-4 : Initial commits
Patchset 5   : Fix state not showing properly
               Remove old comment
Patchset 6   : Fix comments per Jesús David

This commit also inlcudes a bit of code cleanup and sets the
default tiles to AOSP defaults

Change-Id: I15371989bb2ce977d1b715e52d9c92c27ea108ca
Merge "Quick Settings: Add Network mode tile (part 1 of 2)" into cm-10.1
Memory leak due to bad destroy sequence

During the destroy sequence, it happens that the mWebViewClassic was
set to null in the transferMessages function and consequently, the
call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is
not really removing the view from the watchdog's list; creating a
memory leak.

picked from master branch https://android-review.googlesource.com/#/c/48087/

Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57869
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
relative path fuer chatrooms.ser
change stupid mistake
new page for veiwing single gitub repo
remove mateconf from configure
Missed savepoint version
Added Team DIRT to Show Your Support slot
change vendor

Change-Id: I2bfae41c6edca7116db827b064b939b954d8be1a
day 6 edit copy
Merge pull request #303 from mkelleyharris/master

Efficiency Plugin Progress.  Real data isolated for real calcs. Displaying fake value, programmatically now.
catching up with javascript
resolve conflict from two independent coffeescript compilations. yuck.
Added detail about which [spec name].rb are currently packaged.
Clarification of the Javascript testing section.
Merge pull request #309 from StevenBlack/ReadMe_Updates

Changes to ReadMe.md...
deal with missing fields when making and using sitemaps
don't let expected values change with daylight time
Merge branch 'master' of github.com:WardCunningham/Smallest-Federated-Wiki
builder.pl now also builds CoffeeScript plugins.
deep copy protects source data
force plugin documented
added the first, very simple files
changed some css-classes and added Code-Example to the README
added .btn.hover to less
fixed a typo in README
renamed some variables
edited the README
Twitter Bootstrap 2.1に対応しました
remove inline style as it depends on my custom theme
Use the right bin path
Minor CSS styling for profile editor #503
Added new {receipt_id} template tag
Fixed column width in the payment history
Emails mas lindos
i think all the pics are inserted
unflipping two flips at once failed, bugfixed bad variable reference, fixes #120
Added initial Debugger client implementation
change beforeunload to unload

I don't know why this was working before, but now, using beforeunload
makes firefox.exe persist if firefox is closed with the UI on.
tip for zooming by dragging
only show zooming tip after some recordings.
xpi change
updater.sh: only format data if it is not already ext4

Change-Id: I7b7bb92f92af6850444095bbd8dac009080c7e24
recovery.rc: fix adbd and make sure it is run as root

Change-Id: I6dc973f750b0bd1b4d56e9cd1d3465b5337eda20
updater.sh : no datadata partition

Change-Id: I139a71cbd9ab72e26ffa9d5e0b7bbd6d70577807
Unfortunately even IE9 doesn't play nicely with <SECTION> tags
Index.html is just displaying all game sections inline when I run in IE9.

Changing to use <DIV> tags.The mouse motion icon still doesn't display on IE 9 but thats
another days march ! I reckon nested DIVS are screwing with IE


Signed-off-by: Aidan Casey <aidancasey"gmail.com>
fixed and tested
gtest added
Did not mean to upload the ZIP file >_>
Reorganize media file structure and add 3rdparty libraries.
Add "twitter bootstrap scss" as a submodule
update scripts and styles from syntaxhighlighter git repo
change LGPLv3 -> GPLv2
Fixed slider shortcuts message background color in landscape

Change-Id: I0c6ab4bcad8814dc4486706e3b5f347040365542
Settings: Fix IME selector not updating when you enter IME settings

Change-Id: I36fda6507752be8b614278b5dc36e60527f0b2a0
Settings: Dutch translations

Change-Id: Ie12540a99b866981c86255a796d468229be237f6
Settings/TR: Initial commit for Turkish

This commit includes changes between 2012-07-15 and 2012-09-15.

Start : Add preference for enabling root access (3/3)
End : wifi: Allow configuration of country code for wifi (2012-09-15)

Change-Id: Idf3be5831422cbfc655eaa225244365defeec5ff
Settings: Updated italian translation

	Added "clock alignment"
	Added "answer with Home button"
	Added "region code for wi-fi"

Change-Id: Ia36ed954303fdcdad6709bb8d10b14aeb4e8d326
Settings : NavigationBar Customization

Settings side to customize the navigation bar buttons.

Patchset 1  : Initial commit (No support for Nexus 7)
Patchset 2  : Improve edit menu item text
Patch Set 3 : Rebase

Change-Id: Ibd51fbca96d5f0d5e75c7bd74dc5ec62ed1d969d
es_ES: Added translations for new features

Change-Id: Idd86b3e941c6c26e491d2b15a57e90e87d6d59e4
Settings: update german translations

Patch-set 1: Add german translation for clock alignment.
http://review.cyanogenmod.com/23011

Patch-set 3:
Add german translation for "Option to control cursor in text fields using volume keys".
http://review.cyanogenmod.com/22015
Add german translation for "ability to answer call with hardware HOME button".
http://review.cyanogenmod.com/22153

Patch-set 4:
inline comments

Patch-set 5:
Add german translation for "Allow configuration of country code for wifi".
http://review.cyanogenmod.com/23243

Patch-set 7:
inline comments

Patch-set 8:
arrays for Patch-set 5

waiting for more commits to add translations

Change-Id: I42553e6ea934292132d2a9fb51e7526bca7ae2cb
PT-BR: Added Missing Translations

Change-Id: I9d670e631c6d5cb0f35d6586787ddbf6674beb02
Settings: Adjust available options based on screen lock picked

Disable / enable the available screen security aditional options based on what screen lock was picked.

Change-Id: I634b18b58d0e1a1c075f9808776fc4f685316221
Update Russian Translation-Settings-CM10
es_ES: Added translations for new features

Change-Id: Idd86b3e941c6c26e491d2b15a57e90e87d6d59e4

Conflicts:

	res/values-es/strings.xml
Merge "Fixed slider shortcuts message background color in landscape" into jellybean
Added hungarian translation for clock alignment and home button answer calls settings

Change-Id: I45f7563088f0e4f6feecef62f3af5ae13d90c624
Settings: Fix translatables

Change-Id: I390df6e77b7e7cd7559b46cadcb2898ef21ecc54
Merge "Settings: Fix IME selector not updating when you enter IME settings" into jellybean
Merge "Settings: Updated italian translation" into jellybean
fix crash on Input method settings

Change-Id: I8e75abc13c021cf2357db6c0e7987ee7f106c920
Merge "Settings/TR: Initial commit for Turkish" into jellybean
Merge "Settings: update german translations" into jellybean
Added MIT license
Added license
update paths to include some variables needed for building
Fix duplicate user when app_user is in access_users for Cap deploy
trim empty space
Merge branch 'master' of
github.com:victorcai0922/SeleniumFitnesseProject
add resources folder and test folder
Merge branch 'master' of github.com:victorcai0922/SeleniumFitnesseProject
Localisation updates from http://translatewiki.net.

Change-Id: I7e872b77125f7b0f7d663fa1797868f2ae7c5e93
[zen-14] Add license file & headers
Merge pull request #89 from Maks3w/zen-14

[zen-14] Add license file & headers
ditched Publishing repo
Small changes for cleaner code, and a TODO-list
OMAP3: switch to cexec.out
fix typo and resurrect sound et al.
Handle quoted strings in java cmd
minified the tag cloud logic
Added includes for categories, archives, and related posts
Added category count
Updated 2 posts
PATCH: applied linux kernel patch 3.0.44->45-rc1 (Test)
Update notes for submitted changes

* pyramid: add libc2d2_z180 to proprietary files
Update notes for submitted changes

* hallon : props to enable ant+
Update notes for submitted changes

* mesona: remove charging animations
20120317

Fixed libfilterpack_facedetect.so which no longer breaks Face Tan and Face
Glow when editing pictures in Gallery.
Up project : search form
correction liste amis proposés
Updated to version 0.2.0.

Signed-off-by: Florian Wolters <florian.wolters.85@googlemail.com>
Final Update for 3.1
Final Update for 3.1
Merge branch 'development'
Final Test Before Launch
changed the navigation and fixed a few things
renamed file and changed title of grammar
Class 3 Stuffs
Work In Progress Map Editor
adding build.bet
setenv.bat and build.bat for windows
fix a bug in RichText
renamed mod_version
Merge "Volume Settings: link volumes / mutes vertical arrangement" into ics
Volume Settings: fix link mute states checkbox

The test to determine checkbox state was wrong, resulting in
apparent nonpersistence and confusing state.

Change-Id: I163d3518d2c5d4dd4765203e4f694f1f94967c33
config: remove hijack dependency

Change-Id: Ia54001715cee7d9471943c49d446d4330385ec22
Revert "stub for libssmgr.so (experimental)"

This reverts commit 7be15046369dbf668af13939dfe1b36d9ddad9d4.
Mms: Updated czech translation

Change-Id: I1a5a58a90314c17c5814c6802bfd1ea0b757ca5f
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Merge branch 'jb' of git://github.com/AOKP/packages_apps_Mms into jb-aokp
Replace _e() with __()
Added Mp3 Feed, Did you changes to the back end parser to make it work better and added a file browser but won't make that accessable until futher testing is done.
fixed stop update
Made changes
Merge branch 'master' of github.com:SpencerForell/Study-Participant-Portal
Added functionality for participant to answer all questions available. Added automated email functionality when study is created. Optimized matching algorithm. NEEDS TESTING! -MM
Fixed some merge conflicts. -MM
fixed a couple of minor bugs -MM
remove (we'll just delete log entries from south table)
adapt changes of DATASOLR-7
Error en el readme xd
GraphMultiEPG experiment
Czech: added missing string for fingerprint unlock, fixed

... and sorry for all typos :-p

Change-Id: I9a1a5ae85581e364495d7bdad081bae2a108eb99
Correctly restore the 'Use ringer volume for notifications' setting on
cancel.

Change-Id: Ic0a26bb182e68255bea8d68893d28d0d6b9f9f97
Handle unfinished mobile data changes properly.

Change-Id: I7c7e588730024a82be8fca64d7847aac6c2e069b
Merge "Handle unfinished mobile data changes properly." into gingerbread
Merge "Czech: added missing string for fingerprint unlock, fixed" into gingerbread
Settings: update Simplified Chinese translations

* Some GPS and BT related translations

Change-Id: Ibe80ad556e1bdd01b3ed8a910c68c9ff68800b08
Settings: Dutch translations

- General improvements
- More use of &amp;
- Remove 'instellingen' from 'oproepen' (as 'instellingen' is never used in that menu)

Change-Id: I609927f6e1990f7dcac0aa9cacbb0c645028eafa
Make sure internal state is initialized when toggling network mode.

If the MobileDataButton toggles the network mode, NetworkModeButton
relies on internal state when deciding whether a switch is needed.
That state, however, is only initialized in the updateState() method,
which is not guaranteed to be called prior to toggling state via
MobileDataButton if the settings app was removed from memory before.

Change-Id: Icb5e27635e1a6e3bf5e1f4b1264b33c18b414670
Settings: Dutch translations

Change-Id: I99bf5ec91dc94c5822109d77c1f0e7103ed411a4
Settings: Use new Google apps

Replacing (Android) Market with Play Store and local variants

Change-Id: Ife196bd750fb49c04a7ec63d554a165ba5681f75
Merge "Settings: Use new Google apps" into gingerbread
Merge "Settings: Dutch translations" into gingerbread
pattern unlock screen: Add an option to hide pattern error

Allows user to choose not to show pattern error when the
"visible pattern" option is disabled.

The methods this uses are already in frameworks.

Change-Id: Ic57f4acc686610457f37d8aa7535c376d5b4a300
Increasing ringtone volume option (2/3)

Change-Id: If303f3b0b3a433dac52bfe7c1599de6a8dbf1104
Czech: added missing strings

Added strings for error pattern and for volume increasing

Change-Id: I749cbbbca696840df2b6152bbcd6226134c4b35c
1 digit WEP pass allowed
option to forget all networks
fix merge

Change-Id: I823338089782ab920743e916bf0442b375effc49
Merge branch 'gingerbread' of https://github.com/CyanogenMod/android_packages_apps_Settings into gingerbread

Conflicts:
	res/values/strings.xml

Change-Id: I9783bc6625bda74d5a946cec16e4b091fcce19c6
Merge branch 'gingerbread' into icsify
update kernel and modules (2.17 RUU)
borrow some cm10 permissions
1.7 PluginResult changes
updated readme
Alterando Cadastro
setprop: ro.HOME_APP_ADJ=1

Change-Id: I968e15e9b9e5f9cf4f52acca436121ec8efea85b
Rename CPI -> Business::CPI
Rename test
Add author dep
Исправил отображаемую информацию
elliptical photometry fixed
fixed the pa error -- due to deg/rad
convert old post to MD
Initial Bundle class added
Update modules/beginning-actionscript/textpages/intro-to-programming-and-actionscript.md
Site updated at 2012-11-13 18:33:39 UTC
GDCR 2012
LPS-28545 Make the listener work on windows
LPS-28549
LPS-28359
LPS-28359 It's better to just use UnicodeLanguageUtil.format instead of HtmlUtil.escape(LanguageUtil.format. Please validate.
LPS-28359 Prevent double escape?
LPS-28359 Use UnicodeLanguageUtil
LPS-28432
LPS-28482 Refactored to allow other keys
LPS-27752 Update password action must respect ticket type
LPS-28492 ADT Remote Staging Duplicated Key
LPS-28492 Source Formatting
LPS-28492 Source Formatting
LPS-28404 First step is to remove really old references to AssetEntryDisplay. This was first introduced a few years ago and was only referenced in a custom portlet that is no longer relevant, so it is safe to remove.
LPS-26481 Fix issue where "ant build-client" failed for trash portlet
Regenerate
LPS-26481 Source formatting
LPS-28404 Simplest fix?
LPS-28404 Apply else where
LPS-26583 Add ability to export DDL using custom locales
LPS-26583 Show localized values when exporting a dynamic data list (CSV and XML format)
removed unused ivars
Added junit test for late binding of model's region resolver
added crawlspacestudios post
master required
Updated style, added syntax highlighing
Check in the new build
fixed border radius for ie
It is better to hardcode it
Configuracion final para la presentación
Set Up Master Templates

-created startup template
-attached blank stylesheet to template
-added content changes
-created editable regions
-added custom content as header to each page
-created navigation bar
-added background
Test for gregoryloucas.com redirect

Signed-off-by: Gregory Loucas <loucasgp@gmail.com>
add event's title
Add requirement and sample configs.
Site updated at 2012-08-13 15:16:08 UTC
Site updated at 2012-08-13 15:55:05 UTC
change to dump IR buffer format
Fixed the index text of Recursion.
Add todo stuff moar moar moar
Initial map stuff.
Stuff
Add TODO.
Talk about seqs, anonymous functions, map and sets
Update NOTES and add TIME.
Merge branch 'master' into gh-pages
Update HTML.
Testing commit from git local
i like this property naming better
(cherry picked from commit aa71a90a56ef310385f75d9bf5724f49249ba995)
Add four more inspection types
Fixed "Who's the mastermind behind this"
Added 2 new achievements
More changes with base page, usermodels
problems upload
Updated checkbox and label factory
Update README.md

correção ortografica
Styled tabs and panels
board-endeavoru-power: set cpu_lp2_min_residency to 2000
Basic: Single Custom UIView and a UIViewController
list of art details shown in activity, work on layout
bumping version for vars fix
live url fix
logging url
logging url
killing log statement
Added parser for Studentenwerk Potsdam
wsn + database
resolved confilicts
Decided to ditch the footer
Sidechain example.
fix an erroneously constructed query
Merge remote-tracking branch 'ionauth/2'
Add space between view images and (#)

Added a space between view images and (#) to conform to reddit tab styles for other discussions () and related ()
final

reedited images again to fit into the slider better. AGAIN..... animals
logo was broken for some reason...
metadata is not same
pages histoires, amélioration amulette
system: Update kernel/wifi

Changes:
video: tegra-ics: sync with ASUS's TF101 ICS kernel source
cfg80211: fix a crash in nl80211_send_station
nl80211/cfg80211: Make addition of new sinfo fields safer
cfg80211/nl80211: Send AssocReq IEs to user space in AP mode
cfg80211: Add nl80211 event for deletion of a station entry
wireless: bcmdhd: import bcmdhd from I-9100 (GSII) Update 4
wireless: bcmdhd: import wlan_gpio from bcm4330, remove OOB_INTR_ONLY and
                  add RDWR_MACADDR (to BCM4330)
Bluetooth: bnep: Fix bad ether addresses
media: video: avp-ics: backport/sync with nvidia's 3.1
media: fix corner case in tegra_mediaserver
arm: tegra (partial): fix numerous warnings
defconfig: ics: enable CFG80211

Reference:
 video: nv-tegra.nvidia.com/linux-2.6.git (rel-14r7/nv-3.1), ASUS's TF101 ICS
 media: nv-tegra.nvidia.com/linux-2.6.git (android-tegra-nv-3.1)
 wireless: I-9100 (GSII) Update 4, github.com/solarnz
 bluetooth: github.com/cyanogenmod/lge-kernel-star, github.com/kalltkaffe

Change-Id: Ifd9ef80aa170af44bebbd26ac88f4c53b922d1bb
core: remove extraneous wifi fw

Change-Id: I0d49c3f975eeeee5a34eb0c21683b04489c4fa62
p4wifi: add in 3.1 kernel and associated changes

Change-Id: If1fa3f63b44b1fba37000cfee1dd0be43d798861
More index entries.
More index entries.
Typos.
Save one translation term.
Update with new indexes and wrap lines.
New day.
Update to current version.
Brokers were not included on the sim start
update origin(userscripts.org), and license
layout tweaks to website
use Sub::Exporter
add 'is_even(input)' function to XS
declare 'is_even' function for export
test 'is_even' function from Perl
add hello_to(const char * someone) function

- with expert declaration
- with test to call it from Perl
add hello_to_persons_arrayref(AV* persons) function

...which demonstrates:

 - iterate over elements of an array reference
 - check for contained element types
 - cast according to element type
add hello_to_persons_hashref(HV* persons) function

...which demonstrates:

 - iterate over key/value pairs of a hash reference
 - check for contained element types
 - cast according to element type
add hello_to_persons_hashref_by_keys(HV* persons, AV* keys)

...which demonstrates:

 - iterate hash by given array of keys
 - combination of former lessons
diary day 2
Adding CNAME record as per https://github.com/blog/315-cname-support-for-github-pages
moved front image to body
adding message_runtime deb to CMakeLists.txt
Uploading project descriptions
Remove ubuntu.md and highlight.md
Remove ubuntu menu item
make use of hardware/samsung
Small "contributing" guide containing the essentials.
Updated script to use b2g desktop profile outside of the main directory tree so it is easy to use with source checked out from github.
Added another accordion for the medicine,  vital
signs and keywords borders, units on height/weight, made all input
buttons match, miscellaneous prettifying.  Still need to work on fonts,
positioning, removing transparent backgrounds on calendar and
auto-complete, and displaying the BMI calculation, and creation of
additional style sheets and pages showing other ways the information
could be presented to offer the client more choices.
Only delete the cache files if cache is null

No need to call getImageCacheService() to get the instance to delete
image cache files if the cache instance is null.
It will renew an instance for cache and lead to the memory leak
if renew too many instances by calling getImageCacheService()
multi-times.

Change-Id: I3ff83f49e9e8a8bc211dc26c773f3ccefc974881
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
noch offen: Errorbehandlung Strings, selfcompiling construkte
Modified scaffolds' presentational data
Oops, getSortedBlogItems() was discarding most of its criteria, so it pulled inappropriate articles etc.



git-svn-id: http://svn.apostrophenow.org/plugins/apostropheEntitiesPlugin/trunk@4889 c89fab08-2f9b-42bf-8176-bd3ad6bee547
code mirror 4
Added varbvs software to /ext/
Mini-writeup/experiments on appropriateness of variational approximation
add CNAME for the-undefined.com
set up smtp
CSS final project
Site updated at 2012-08-06 21:06:01 UTC
change some strings and restore transparency till figure out better way.
this should have went with last commit!
Refresh weather on SystemUI, not boot

When SystemUI is restarted or crashed, weather data is lost.
    It will send an intent to refresh weather after it is up,
    so we do not need to refresh the weather here. Instead, just
    double check that weather is enabled (SystemUI doesn't check
    whether weather is enabled or not, it just sends the intent)

- also converted weather request toast to a string for translation

Change-Id: I94a374d3a63c5b115def7bb13e3ce59dc23f2f8a
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Correct drush comment spam post.
removed boilerplate apple touch icons
[maven-release-plugin] prepare release io-webservices-api-1.0
Localisation updates from http://translatewiki.net.

Change-Id: I1d94f7a575e6c7cf03540d4762bb5ce1e3092fc3
bug fix on schema parsing
bug fix on autofill
BasicClasses: 2 周目終了。まだ何周かする。
Squashed commit of the following:
commit f39c06755c5cf02f3cca9e10e171fb7e314a7fc9
...
今日の成果。

Squashed commit of the following:

commit cb9d26e98e4af0778a2dff9abeb1c27552e0c341
...
BasicClasses: 今日の成果。

Squashed commit of the following:

commit 594a6902be3bef6ea5bcdfd3fc9c74d273a144e1
BasicClasses: 今日の成果。506 行まで。
Squashed commit of the following:
commit 5af2fed6e0a25b79dc0c21f6d266f74cd9777f59
...
BasicClasses: 日本語の妥当性、訳の正確性について見直し。最後まで。これで終りではない。
Squashed commit of the following:
commit aff13e266e105c21c35dcab98ab184be24e5f21d
...
common.tex を、platex、luatexja に対応させる作業中。まずは common-platex.tex に、次回の common.tex の内容を書いておく。
common.tex を platex、luatexja に対応させる作業終了。common.tex == common-platex.tex。common-{p,lua}latex.tex は、もう要らないはずだが残しておく。
BasicClasses: 2 周目終了。まだ何周かする。
Squashed commit of the following:
commit f39c06755c5cf02f3cca9e10e171fb7e314a7fc9
...
3 周目終了。まだ何周かする。
common.tex の一時的な変更をもとに戻す。
BasicClasses: 3 周目途中。ASCII 文字と日本語文字の境界にスペースを入れている。
Squashed commit of the following:
commit 8e0115f286c16ebb91dd94fcb44dfb8990e4d81e
...
p5まで
BasicClasses: 4 周目終りまで (work ブランチのログには 3 周目とあるが、間違い)。ASCII 文字と日本語文字の境界にスペースを入れた。次回から Collections に入る。
Squashed commit of the following:
commit 0096539d6cc72f2a58b62dadbb48c2e65629d6b9
...
Collections: 2 周目終わり。
Squashed commit of the following:
commit 9a874c910278167d0e250acb5c2900e4b020c6ba
...
3 周目 100 行まで。ASCII 文字と日本語文字の境界にスペースを入れている。
原文との行番号合わせ。
bimodel-common.tex の変更を混ぜてしまっていた。
BasicClasses: 4 周目終りまで (work ブランチのログには 3 周目とあるが、間違い)。ASCII 文字と日本語文字の境界にスペースを入れた。次回から Collections に入る。
Squashed commit of the following:
commit 0096539d6cc72f2a58b62dadbb48c2e65629d6b9
...
用語の統一。
1 周目 809 行まで。誤って、変更した common.tex を commit してしまった。
ABI: Fixed a typo in example code, reformatted some text.
Fixed ADC bug
Added -n option to specify the number of entries to process
Add title tags to people.
Remove time of day overlay.

Just change color of sky to show time of day.
Kickstarter!

Added a topbar, removed the github link, changed the call to action
to be towards kickstarter, added the kickstarter video, tweaked
the email gather text. Let's throw this mess away!
Merge pull request #1 from AwesomeController/kickstarter

Kickstarter-aware page
first commit

demo front-end interface
Merge pull request #3 from raymonst/first

front end draft
french update: profil and nfc (array values were reversed)

Change-Id: I8aebf5d8b53c2d6c345482f794be89a58482cb9f
Merge remote branch 'upstream/ics' into ics
Update notes for submitted changes

* Update Russian Translation-Galaxy Nexus Settings-CM10
satsuma: update inclusion
TARGET_OTA_ASSERT_DEVICE value fix

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Implemented setControlP
Implemented getMotorForceFeedback
Implemented first version of setForce
Implemented first version of setVelocity
TODO file and modified main.cpp

Made som objects from the classes we coded, and ten initiated them in
setupRC().
ordeno archivos
Revert "Virtual environment creation should use PYTHON_EXE."

This reverts commit 3b5cf70b65c3ec5cecc57b77a0eb04c080024d01.
[fix #38060657] Stop parameters showing up in both the URL and body parameters.
Opening Shared Recipe Documents
phase 1 of rewriting functionality and hooks to ingest content model and collection policy objects
used the new callback functions in the install hooks
Details instead of Extended details
added a DS-COMPOSITE-MODEL datastream to the content model object
cleaned up label
merge conflicts
Merge pull request #24 from DannyJoris/7.x

7.x
made coin class into world object class, can now add powerups
Merge branch 'master' of git://github.com/Kovak/CBL_SECRET_PROTOTYPE_RUNNING_GAME into Kerby
goldcoin animation working
mechturtlespider walk animations implemented
3G functionality
Added ruby env variables to release
modif un lien
erreur XML...
Side of the room?
not ignoring anymore; fixed upstream
Added sample pages
Added sample form
Finish ContactUs.aspx layout

Finished contact us page layout & made general site-wide style tweaks.
there's TWO of em
Revert "Audioservice: fix A2dp support on Samsung's Audio Policy HAL."

This reverts commit e9852f9f7135ef919a9f4d114b77b557ef82e52a.
new msm8660
Preparing release 0.5.0
fixed setup.py
add some steeze
Runnig scripts and configs were refactored
Bandit protocol sends messages to random nodes
Merge branch 'master' of github.com:RobertOrmandi/Gossip-Learning-Framework
DynIstLoader: More than one instance can be loaded
Utils: additional functions were implemented
Revert "ruby: build buspm_dev, BT, kineto, spidev modules into kernel"

This reverts commit d411da694eb8e9a18152a148fc47552589cdfbcf.
fix SplashActivity.java
Add README.mdown
fix README.mdown
fix README.mdown №2
0.05.04 - Bible Reference Formatter
auth protected path refactoring
Merged back googlesearch
Exit dialog from login screen
Logout confirmation dialog from home screen
xml changes, swap out menu in agenda
fix display deleted user bug
Removed Incubator 11 and 12 sub-directories.
add attr_accesible to slideshow_type model
Add check if file s3.yml exist
add attr_accessible list to slide model
add attribute to attr_accessible
try fix custom dimension
try fix custom dimension
fixed for spree 1-1-stable
[README][xs]: rename to fix format.
Modify Wifi and Bluetooth QuickSettings tiles to act as toggles with long-press to open the corresponding settings
Updated all scripts to match current versions in sloodle git, with a blank line at the top to avoid errors in OpenSim.
add ios icon for bookmark [ci skip]
remove second icon link - not needed
Use image_path for icon
Aspassungen ensprechend des Design-Meetings.
Started experimenting with multi-threading in processing analysis.
Added part of a job migration
Added part of a job migration
Hopefully fixed merge problems
Having trouble with the jobs table creating script.
Did more work adding some adding the necessary database tables for processing analysis to keep track of where it is at in a job.
Did more work adding the necessary database tables for processing analysis to keep track of where it is at in a job.
Finished adding the necessary database tables for processing analysis to keep track of where it is at in a job.
Using the new database tables, started adding code to the reference_analysis_isoforms_only workflow to try to get it to flow in a suitable way.
Did more coding for the reference_analysis_isoforms_only workflow.
Added some code related to the flow of the views for the reference_analysis_isoforms_only workflow.
Pondered my ideas some more and experimented with code related to getting a single form to submit multiple models, which may be required if a Biologist has multiple samples in their job.
Experimented with some code to try to get multiple models in a single form.
Experiment with how best to import libraries in Ruby and did more work trying to get multiple models, in my case view models, to work in a single form.
Did more work trying to figure out a good way to have multiple models in a single form.
Experimented with using Javascript to render a partial view, but it didn't quite do as planned.
Disabled some gems to see if I can get the application to successfully push to heroku so that I can test the ssl.
Got the jquery to work, although I ended up having to get the main jquery file (jquery.min.js) through Google CDN instead of the jquery-rails gem and the assets pipeline. Oddly, I was unable to pin down the problem but it seemed to have something to do with encoding.
Ascertained a good way to have multiple models (one of each sample) in a single form.
Did more work with the flow of processing analysis now that I know how to get multiple models on a single form.
refactor runtime config
command line post processing
Forgot to reset the versioning properly
Updating ordinal rev
Updating Windows symlinks file
Merge pull request #9 from forcedotcom/20_should_be_11

2.0 version should have been 1.1 before it went public.
yml fix 5
Fixes: #1273 this code is not correct now that the fusiondirectory.conf contains all the entries
Fixed bar item image and label position.
Merge pull request #5 from greggS/master

Fixed bar item image and label position.
update version string export to include kernel type
Some tests around validation ranges.
Removed a lot of unnecessary software. Installed snpEff 2.0.5 manually (the last supported by GATK 1.6)
Added nosetests_run.sh to run the testsuite within an sbatch job
Execute only the standard tests
Adjustments on a-escola page
Moved csv-parser and collapsible-panel js files to lib
Added pagination features to integrators. Fixed minor bugs, added new interactions, added semicolons to js files.
Backed out previous experiment changes to the Analyses window.
Window management still needs to be addressed. Clicking on GXT3 windows does not bring them forward.
Additionally, GXT3 windows are not yet integrated with the iPlant task bar.
2012.07.30.A
2012.07.31.A
* Default dashboard is nearly complete!
* Icon changed to Riverbed.  See acknowledgements in README.md for details.
Ausführbare Dateien ausgeschlossen
spring batch example added
cleanup result message
Correção de compilação do Netbeans devido à pasta não comitar pelo git.
uzupełniony kompresor
Já é exportado a ficheiro TXT
[MVNDRL-56] Setting version to 0.3.0-SNAPSHOT prior to release
[maven-release-plugin] prepare release plugin-project-0.3.0
Fix for getting translatable elements.
Added init.rc; Added more hci commands; added gps shim

Signed-off-by: mgross029 <mgross029@DRDBLDSRVR.(none)>
refactored modal, added basic server client communication
Version final kikk
need to work on filesystem saving and filestream writing for user interaction log in AIR
OSMM-11: module specific template files are moved into templates
template show company logo
initial-data.yml contains play2 modules (copy from master branch)
small fix for emtpy "contributors" field
better filters for bids
Add simplecov
Align nicely
Increase coverage
Remove unused code
web.config for authentication added dated:-21092012
Hibásan szerepelt a PDF neve.
Added Principles, Evaluation and Conclusion. Missing img segmented.png
separating submit and reset a little bit to avoid accidental clicks
allow checkin double
Bump version into unstable release.
Add job to leads table.
Initialise original_contact_job automatically
Added CSV import hook to import job field.
Copy job from extra csv fields.
Singleton synchronized
disable tests

Change-Id: Ica9de93314e1eccc888450a51abc3aa4260ed0b6
Preferences: Infinite/Loop homescreen scrolling

Change-Id: I4b496e0d906bb8cb9531b8a7bb28d2b8b5de5f63
Not sure if changing private variable to protected in PagedView
is acceptable or not.
elGR - Added missing strings / Minor aesthetic changes

Change-Id: I8044759678bc556f49325f73996388372adce2a3
big cleanup, shrink apk size by 5MB... sigh
added some dummy links for articles related to places
Removing receiver simulator
Site updated at 2012-01-27 21:39:05 UTC
Site updated at 2012-01-27 21:39:29 UTC
Site updated at 2012-02-23 15:22:55 UTC
Site updated at 2012-02-23 16:06:38 UTC
Site updated at 2012-02-23 16:36:55 UTC
Site updated at 2012-02-23 16:45:49 UTC
Site updated at 2012-02-23 16:52:56 UTC
Site updated at 2012-02-23 16:57:28 UTC
Site updated at 2012-02-23 17:04:04 UTC
Site updated at 2012-02-23 17:24:47 UTC
Site updated at 2012-02-23 17:52:03 UTC
Site updated at 2012-03-08 13:51:30 UTC
Site updated at 2012-03-15 23:01:27 UTC
Site updated at 2012-03-15 23:07:57 UTC
Site updated at 2012-04-22 21:15:43 UTC
Site updated at 2012-05-10 18:02:39 UTC
Site updated at 2012-05-10 18:04:47 UTC
Site updated at 2012-05-10 18:09:49 UTC
Site updated at 2012-05-10 18:11:26 UTC
Site updated at 2012-05-12 12:13:58 UTC
changed the CVector3 class to a template class and created a derived vector with PBC applied
Chef Webinar
Tamir added twitter js
Merge branch 'master' of github.com:CloudifySource/cloudifysource.github.com
Tamir commented the early access
Merge branch 'master' of github.com:CloudifySource/cloudifysource.github.com
Update notes for submitted changes

* overlay: update NetworkLocationProvider,GeocodeProvider
Update notes for submitted changes

* Enable sprint_mwi_quirk to fix "Phantom Voicemail" mwi notifications on Sprint
Update proprietary-files.sh: libakm.so

Change-Id: Ic998a6b2a1d9e48b4eb18459a3d0793d58baaa8f
Update notes for submitted changes

* wifi: fix ap path
Update notes for submitted changes

* Updated Hungarian translation
Camera: streamline settings

flips anti-banding and color effect arrays so all options go from low to high

Change-Id: Idc47537f2e0b49c8e54a8920a9d64cb6d0b1fbf1
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
camera: add options to restart preview in certain cases

needed for borky camera hal on i9300

Change-Id: I6f5d2919fc9f1061d958517ca293a793327c7994
EVToolbox: remove from launcher

Change-Id: I28f288c8137d320bdc4172fbb3427b5e2fe5eb91
Phone: Updated czech translation

Change-Id: I5ad2bf21a64167d06d3374bfb15e37eaa9be21fd
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Phone: Updated czech translation

Change-Id: I91483c7875de53d892a2e41c9acca61565fb9ea4
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
rename default skin to classic (c40419bdfe)
reformat changelog
initial person management gui coding
tournament insert kai event insert kai update
Merge branch 'michael-a' of https://github.com/KarateGeekTeamCY/KarateGeekCsharpEdition into michael-a
added myself to members list
Merge pull request #102 from p5ilva/master

added myself to student list
lets really fix grouper statusbar

Change-Id: I278dea65df849f30ec9c6ec5b780b32c38c92785
Corrected Zephyr-reported values
[maven-release-plugin] prepare release aircasting-1.3.29
- BlockAreaItem cloneFrom
Refresh weather at boot and add possibility to start a custom app
[maven-release-plugin] prepare release ness-httpclient-parent-1.0.0
Added UI + DEATH

The Player can now die by losing all of his Health which results in a
friendly message telling him about his current state.
Room Content is now placed randomly in the room
Potions + better Ticking

The Player takes his turn now before anything happens otherwise
Added FOV and Exploration

The Player can now only see Rooms he has Previously visited
Probleme de PCN par rapport a la connectivite et probleme de choix des broadcasting nodes regles
Fix "Reset Custom Carrier Label" [refresh actual value (summary)]
ejtagle's patch to sync RTC's as Tegra's RTC looses it's data after
power down.
Fixed Multitouch Bug. Who the f... did this ... aaaah.
plus another permission change to access LED trigger from Android
Reduced TS and G-Sensor CPU usage, HDMI stuff from Fards

Conflicts:

	arch/arm/mach-tegra/board-smba1002-gpu.c
	drivers/misc/lis3lv02d/lis3lv02d.c
Some patches from Nvidia's git and permission change required for
Android's LED notification to work.
Updated defconfigs
msm8660-common: remove duplicate line
Minor update in post-init script to make it more compatible with used in other ramdisk
rearranged stuff in header, killed timeout on scroll
Combined three standalone stylesheets into one stylesheet with media queries
Backend mostly working, front end next.
invert slash for windows
Update XSD, add WSDL and xjb
Updated
Resolve Get entry failed:javax.xml.bind.MarshalException 
 - with linked exception: 
[com.sun.istack.internal.SAXException2: unable to marshal type
"com.sugarcrm.sugarcrm.LinkNameToFieldsArray" as an element because it
is missing an @XmlRootElement annotation] 
Add new test getEntryList
I removed the old WSDL. Now I use external XSD
Add new configuration for XJC Apache CXF Plugin
Removed old import package
Update README.md

Added coderwall endorsement tag.
Redesign of Header and Footer plus bug fixes

Redesign of Header and Footer plus bug fixes
notify: Tabs -> spaces.
Require libnotify >= 0.7.
Merge branch 'master' of github.com:audacious-media-player/audacious-plugins
trying a faded line
handle setting encryption pw sync in the settings db

Change-Id: I759155e3c4cf47f453cd74c550b4218f7deec7c6
use the same preference key

Change-Id: I003d8556fe2f37af7de6e3d33f59bf596eb246e8
add prebuilt gb kernel
Bug fix

Fixed crash when Transmit was running with zero open documents.
cfX: statusbar: add mContext definitions
Set up User Roles and modify the User model
Sitemap generator now displays subcounts for every type of URLs.
beginning merge of content from advanced section to main patterns section, still plenty of edits to go
merging module pattern sections, removing repetition
merging observer pattern sections to avoid repeating
merging decorator sections
further cleaning up the TOC, making the MV* section clearer
further cleaning up of the TOC, minor section edits
adding section on MVVM
fixing a number of markup issues, afirst attempt at integrating OReilly Open-book theme, other cleanups
very minor update to include author link
adding more to the section on MVVM history
adding corrections based on technical review 1
addressing more items from the technical review
Typo corrections.
Further typo corrections.
Further corrections
Further corrections.
Merging book changes
finished models documentation
first draft documentation on views
splash scree, settings view, common.js documentation
starting to change virtualbox to extract and install so we can get a no reboot option
Added inplace test project.
Fixed bug on Activation and Deactivation hooks
improve layout
add new posts
Added world-to-screen conversions
MOAR GRAPH-X
Detalle en Visits: añadir user.js desde base.js por si el módulo no está activado
Arreglo en options.js

No se van los estilos al cambiar de pestaña
isocialproject.github redirige a blogspot
Added back link to lint/hint subdir indexes
Merge branch 'master' into gh-pages
Site updated at 2012-09-04 12:47:58 UTC
Set safe default min and max freqs
hide address bar plugin v 0.1
more gitignore
tutorial imported and working..
Added instructions and some info.
adding the developer documentation to for getting started with Git
Delete left-over Scratch directory.
Improved build status message (again)
Fix bigmem not loading
MODIFICATE BENE :D
Doc tweaks
Add ComparableInterface
Start testing tree map
Doc block improvements
Break retainAll() description into short and long
Doc improvements and fixes
Overwrite docs in ArrayList
Add return annotation to HashSet
Add optional subList operation
Added CTA to homepage and content to Bestiary.
Susan got utube API to output video search results on cmd
Site updated at 2012-10-21 10:50:29 UTC
Site updated at 2012-10-09 07:31:46 UTC
add prefs option to show green icon for successful builds
Merge pull request #19 from negesti/master

added Green Balls plugin (close #19)
Added new posts.
Added option for time-stamps in posts.
Site updated at 2012-12-25 21:40:15 UTC
fix crash on Input method settings

Change-Id: I8e75abc13c021cf2357db6c0e7987ee7f106c920
Fix from to size in date filters
The original Magic Kettle story from Andrew Lang's Crimson Fairy Book
[Added] Data gets added to acceptedoffers when a year ends.
Updated gitignore to exclude silverstripe-cache. Added expires + cache info to default htaccess
NEW Side by side editing functionality - first cut (os#7412)

Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
MINOR: Translation context
Add preview drop-up, same as in preview column.
Add missing class for preview-mode selectors.
Add the name to available states so we can use it with the new previews.
Set the cms-previevable class.
Remove preview button from history section.

It no longer works.
Replace text in switch
Repalce preview toggle template code
Change target window
Convert CSS to SCSS/SASS
boot-scripts streetware-tool added
Initial JB commit: part II
Current resume
Upload all source files including bin, src, data

Plus resource and doc folders
Fixed unknown error in section and chapter ref
Localisation updates from http://translatewiki.net.

Change-Id: Ic1b9cd4b3dbf3ee13b9688dd5baf8e1b0af51011
Must be WikiPage, not Article

Yay for fucked up variable names.

Change-Id: I71251a49fbb81731f460ad38bba885305e54d2e5
Corrected brackets
New projects.
New gitignore values.
chkkineto.sh is nowhere to be found so remove calls to it
Start working on a dojo version :-)
Update notes for submitted changes

* Update Gamma tunning to meet with new kernel work on gamma
Update notes for submitted changes

* libhwcomposer: draw full layer if dirty region list is long.
Updated to jQuery 1.8.24
Merge branch 'hotfix/user_date_joined'
Merge branch 'release/tucker'
Fix syntax error in workgroup base template
Merge branch 'hotfix/reseau_correspondants_template' into develop
Add prebuilts to copy
initial notebook test
initialize cell_width
display hmm via signal handlers
Removed CMakeCache.txt file and CMakeFiles directory. This is a small bug fix
Add tests for in_group?/in_ldap_group?
Inherits xhdpi to fix missing nav buttons
Revert "Add NT_MODE's for NETWORK_MODE's 8 and 10"

This reverts commit 269d6b0db584fcb4196d4b2c1becbe1baf2eaf96.
Revert "PhoneToggler: Fix toggler on LTE+GSM phones"

This reverts commit e67a7b1799ae0d61a39bb5f383f24686a0f39cff.
Revert "Makes network mode toggle work. Port from CM7."

This reverts commit 2d618c87404d4da21544d86d030be98746902125.
added documentation into the repo and removed unused images from from repo
Ignoring *.sdf files.
Ignoring ipch files, too.
Removing intellisense files from source control.
Cleaned up debug prints.
Added utility for solving Project Euler Problem 96.
Update User research/focusgroupsminigroupsandinterviews.md
Update UFW rules.
Исправил код чтобы исправить json в БД
new api set to v3.3.5
modified a description.
removed all the footers; formated all the files
Merge pull request #103 from OlingCat/master

移除了cvs用的所有footer，重新格式化了所有的代码。
lecture foo
Restored language file format
Signed-off-by: jfederico <jesus@123it.ca>
Merge branch 'master' of github.com:blindsidenetworks/moodle-mod_recordingsbn
Uses the prepareQuery method.
Adds handler for query prep. event.
tidying up, made new static class just for example data. Fixed a little bug in knockout VM
Revert "omap2plus-cpufreq: user voltage control code"

This reverts commit 28b2e225588b35575f76511803125f3889e4f29e.
Sync added to time of POD
Added missing initramfs files *derp*

Change-Id: I849ee2c9e42ab7c6194543b45e6364973fac16ce
overlay: update location provider config

Change-Id: Ib486f6eb6e8e224067e4476228f3cc82ef760bde
libcamera: enable scene modes and touch to focus

Change-Id: I7af113f887cc860253f41d3edd1e61e8a7a82022
libcamera: allow changing of ISO modes

Change-Id: Ib54b8ab78c62a551bd0121dffafe9bbc24fe52c0
Fixed lame warnings...
Add test case for use of late static binding static:: outside class scope.
Made it possible to down data for entire elections.
Removing unneeded div el
moved button to the third line of the editor
upgraded to twitter bootstrap 2.1
Removed obsolete tests.html. We use Jasmine instead now.
Removed unused background images.
Merge branch 'master' of github.com:mecathcart/Drag-and-Drop-FieldLinguistics
Changed image paths so the work on Android.
Changed image file extensions to lower case.

Otherwise, they weren't showing up. I was just getting a yellow background.
PDF's
Merge branch 'master' of github.com:moretea/summerschool_parallel_programming

Conflicts:
	day4/assignment4/filters.sac
added updated classes.
Replaced Songbird strings by brandShortName instead, closes #3
DFL-3078 Error in TC, no Error to examine.
touchscreen: add extended config

-merged from:
 https://github.com/CyanogenMod/android_device_samsung_n7000/commit/83ac03a566e30fd6fab4a332ae9db22e3b51fb6d#usr/idc/sec_touchscreen.idc
Revert "overlay: remove screenOffAnimation (default is true)"

This reverts commit 8632fd93c0881dd196b07f0fedb3703930193f09.
wifi: remove unknown flags in wpa_supplicant
hdmi/cameradata: move to device tree(s)
overlay: fix A2dp support on Samsung's Audio Policy HAL

-merged from:
 https://github.com/CNA/android_device_samsung_crespo/commit/8d1e25a6264c886d31564a1d3eff210501f461f6
audio: add AUDIO_DEVICE_OUT_AUX_DIGITAL (Hdmi)

-reference:
 waydownsouth/codeworkx/plastikman
solving the problem with git
fixed lang
[i/97] fixing merge conflicts
[i/97] changing line endings to LF
Merge branch 'Kamahl19-i/97' into develop