labofsahil/github-event-dataset-2012 huggingface dataset:
Revert "Merge "Hun translation: Correction of the volume_key_cursor_control direction" into jellybean"

This reverts commit 9dfa9ef21f9e2f8f2811e445c1198ed23d3701d7, reversing
changes made to 714c5304707253147a8b39c09fe75322d3e5b2fc.

	modified:   res/values-hu/strings.xml
Revert "Merge "Settings: Added missing danish translations for USB Mass Storage and volume key cursor control" into jellybean"

This reverts commit 4449f5cd4dc6c5a724ebd2227bda86dd19dd568a, reversing
changes made to 6a05c27cb33bda1cd17a7c137aca2204dc3fcbcb.

	modified:   res/values-da/strings.xml
Header Finished

renamed index.php to header.php and renamed style.css to headerstyle.css
Forgot to add the plugin..
Rename long file
Dependency updates.
[maven-release-plugin] prepare release ness-server-parent-2.0.1
Moved PersistentList tests to PersistentListTest type.
	PersistentListTestBase now just creates the impl type to use for testing
	Each list type provide list-specific tests as normal
Created the implementations of the insert and getItemAt tests.
	Most getItemAt tests now pass.
	None of the insert tests pass as the method has not yet been implemented.
	getItemAt for a stack needs to be fixed because of the reversed storage
Created first working multithreaded test for list add and get methods.
Completed insert tests and implementation for PersistentQueue.
	Still need to work on the PersistentStack.
Completed insert implementation and tests
	Fixes #7
	Note that tests fail because blocking tests are not fully implemented yet.
Merge branch 'feature/insert_list_item' into develop
Starting to work on Ohca extract
Making Christmas
Encrypted passwords/emails, added password retrieval button.
Site updated at 2012-12-25 21:34:56 UTC
Site updated at 2012-08-26 23:12:07 UTC
Site updated at 2012-12-03 08:18:03 UTC
MDSW-2819: Adding changes to server.xml, as per http://www.liferay.com/community/forums/-/message_boards/message/4824410
Added (unused) option for later usage
Fix Issue #46: Login Redirect now also checks for the next parameter.
Windows XP lange pack does not support French Windows
First post - building wintersmith blog
First blog post! Hurray
Use markdown for about me texts
adding a SLN

adding SLN so working with this code is easier going forward
remove prebuilt omxvdec
fix libcamera_client
Calculation of available space improved
Update jquery.mobile.extensiblelist.js

Credited hiroprotagonist
Autoscroll as parameter for function _displayMoreItems
Replaces `disabled` with `isDisabled`
Merge pull request #20 from Gravatronics/cleanup/isDisabled

Replaces `disabled` with `isDisabled`
add our R3SVirtuemart standard
Added minimal OpenCL C++ sample
Merge branch 'master' of github.com:alanmcintyre/No-nonsense-GPU-samples
Inclus�o da documenta��o utilizada como base.
switched matariki and minutedock around on homepage
Fixes for newer toolchains

Change-Id: I1f6e250fec91e2c9822385664cdee5d9d79e7030
make deploy script end with Done output
Merge branch 'master' of github.com:alphagov/government-digital-strategy

# By Roo Reynolds
# Via Roo Reynolds
* 'master' of github.com:alphagov/government-digital-strategy:
  fixed broken link to /digital/strategy
initial check-in xcomm_cal

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
PLugging in thyme templates
There is no significant difference between 1D and 2D
fixed prettify style
added OpenFromPath.
the IMAP sync tests pass! woo!
Sync fixes: be sure to avoid expansion without explicit approval.
Define text
Improve buttons for scout sections
Merge pull request #14 from stoofer/master

Nicer scout section buttons
checking in source after creating git repo
updated readme
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
update documentation
update documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
updated documentation
Primary Library
tests for login recorder
Little updates to the abstract
Site updated at 2012-11-28 19:54:57 UTC
update colors on website
* initial version (raw HTML clickdummy)
fixed a minor bug with setting the InstallTrustedSites from the constant; blanked out AnswerFilePath if the file doesnt exist so that log file shows correctly
update back.sh
Added quickpay helper
audio fixup
error if no ace vendor repo
resolving flickr conflicts
Add repeatable class to divs.
intial commit of JB attempt
A run in the park!
# Implementing Markov Localisation Tennis Rating.
lösch-funktion überarbeitet

Signed-off-by: Patrick Meppe <tapmeppe@gmail.com>
Merge branch 'master' of https://github.com/deburnatshazem/sherlockholmessystems

Conflicts:
	entwicklung/workspace/SherlockHolmesSystems/build/classes/MODEL/SERVICE/_Config.class
	entwicklung/workspace/SherlockHolmesSystems/build/classes/SERVICE/Config.class
	entwicklung/workspace/SherlockHolmesSystems/build/classes/VIEW/FreigabeDialog$2.class
	entwicklung/workspace/SherlockHolmesSystems/build/classes/VIEW/FreigabeDialog.class
Removed output for passed tests
Let rails handle assets in production
Update of FSM testers
added readme file, updated the color palatte file
asdkhasd
add some more firmware and build liblights again
maven dependency
simple http filter
implement single sign on dengan CAS
implement logout
remove volunteer link
correcao de erros do xsd e wsdl
New version of OMF packages
change build.xml & it inset html according to mobile.device.platform
Merge branch 'master' of https://github.com/gihankarunarathne/DocBook-xsl-mobile
Added IndexedDB polyfill for other browsers

The IndexedDB polyfill enables the example to fun on Safari and Opera also.
This way, users will just have to use one API (IndexedDB) for all their client side storage needs instead of having to serve WebSQL or IndexedDB, depending on the browsers.

Tested this on mobile browsers too. 
Merge pull request #3 from axe-sneakpeeq/patch-1

Added IndexedDB polyfill for other browsers - now we cover: Safari and Opera! This is excellent for mobile web apps...
Added more notifications to settings
Add border and sizing for images in posts.
Add photos to last blog post.
Site updated at 2012-12-11 19:58:37 UTC
fixed abstract with special chars
CORE-3288: fix some exceptions that were occurring when we tried to read JSON directly from an input stream
Using the constant instead of hardcoded sandbox
Merge branch 'master' of github.com:iliasbartolini/code-africa-education
View Project partially complete. Created ticket presenter. Added couple TODO's.
Back-porting to 4.2

iOS 4.3 specific call to imp_implementationWithBlock replaced with
static function.
Designerized
Adding a wrapper method to $this->db->select().
point output to bin
optimize & fix bug
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.4.1-3.3~ci~20120713002633 u8500 only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: CI: Start new release
linux-linaro 3.4.1-3.3~ci~20120927001835
        created from:
        tree:git://git.linaro.org/kernel/linux-linaro-tracking.git
        branch:linux-linaro_3.4-2012.05-1
        commit:6ba32bb59015878eff51c3aca1efae959bc2ae8f

packaged-kernel-branch-commit-hash=6ba32bb59015878eff51c3aca1efae959bc2ae8f
commit 6ba32bb59015878eff51c3aca1efae959bc2ae8f
Merge: 3f30472 774c3a2
Author: Andrey Konovalov <andrey.konovalov@linaro.org>
Date:   Tue May 22 20:39:37 2012 +0400

    Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Site updated at 2012-10-06 18:05:10 UTC
added sharing buttons, adjusted top margin
faster than native sort
set a root route to send back some text
ipset and dependencies
Merge branch 'master' of https://github.com/jpastuszek/wasp-Amazon-x86_64-extras
rebuild repo data
fix issue where form was being submitted twice
Straight stock from latest ASUS source
auto-20120328041701408322054
Fix broken default arg
Updated to Jquery1.8.1 and -min js files

Signed-off-by: matt-tyas <matthewtyas@hotmail.com>
Deleted Jquery 1.7.2

Signed-off-by: matt-tyas <matthewtyas@hotmail.com>
Added spacer.gif for use with imageSizer and minified version of imageSizer

Signed-off-by: matt-tyas <matthewtyas@hotmail.com>
deleted patterns.html

Signed-off-by: matt-tyas <matthewtyas@hotmail.com>
fix typos
fix typos
Merge pull request #119 from pduranti/master

PUT dimensions
don't need to keep the customized compile.sh which I'm not using during postinstall
Calendar cucumber test
remove debugger statement
Merge branch 'master' of github.com:michaeltreger/CS169-Campus-Scheduler
Started working on auth backend.
fix #9 - fixed link
Site updated at 2012-06-30 15:02:35 UTC
fixed code page
Update toro device tree
Fix multiple network threads and add running notification
Site updated at 2012-12-05 18:08:28 UTC
Include a link to the github repo (how did I lose that) and put a README into the "master branch" to stop people from contributing in the wrong place
fix #16 duration display when stop activity
reimplemented placeholder logic from the ground up
added a test page for the placeholders logic
Merge pull request #555 from wchristian/placeholder_rewrite

Placeholder rewrite
Revert "Test blog"

This reverts commit e372b3d060dc93aa3c6df6b73521ce529a097b82.
Fixed some bugs with the updater
Adding write external storage as a permission in Camera
[CB-790] Add HTTP status code to FileTransferError
Merge branch 'CB-790' of https://github.com/don/incubator-cordova-docs
Fixes CB-812 - Update Whitelisting Documentation for iOS
refs CB-767 iOS Permissions

updated the permissions sections for iOS
Fixed typo in Storage documentation, HTML titles contained Contact instead of Storage.
Update Windows Application Manifest link.
Update formatting of BlackBerry Upgrade Guide.
updating bada docs to include contacts
Updated Android permissions and plugins.xml documents
Did merge commit, my pull did not pull earlier
Fixes CB-696 -Document iOS Project Migration for 1.8.0
Removing unneeded privs from Camera
Updating geting started android to remove unneeded privs
tagged 1.8.0rc1
Updated for Android
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-docs
Version 1.8.0rc1
CB-813 Update Android whitelisting.
CB-814 Update Bada whitelisting.
Zmeny v okne pripojenia na robota
- vymena textoveho input pola za editovatelny combo box (IP adresa)
- nahradenie labelu "Use default port" checkbox polom s textom
- pridana kontrola spravnosti zadania IP adresy a portu
- pridane zakazanie tlacidla "Connect" ak nie su parametre pripojenia
zadane spravne
- jednoduche okomentovanie zdrojoveho kodu
Site updated at 2012-04-03 13:11:03 UTC
debut article making of
debut article making of
readme
Merge branch 'master' of https://github.com/ruobin/unconstrained-selecting-texts
init
keep Profile in root
Site updated at 2012-09-24 17:19:55 UTC
cache (not mirror) parts of your app for offline hacking
comecando a fazer a view da agenda(telas e MBs), arrumando o menu, ainda nao finalizado
Combined bar clock and navigation color.

Change-Id: I663d750f6ccb6661796b6a7c2694a4e712b61e1e
grammar edits to colophon
Adding support for opera mobile browser 11.50
Adding support for opera mobile browser 11.50
Adding support for opera mobile browser 11.50
Adding support for opera mobile browser 11.50
Adding support for opera mobile browser 11.50
Merge pull request #25 from jwitko/master

adding support for opera mobile 11.50 browser
added page subclass snippet
added frontend fields snippets
dataobject class
initial commit
Merge branch 'master' of https://github.com/shubhamsha12/shubhamsha12.github.com

initial commit
Octopress init
Site updated at 2012-11-30 15:48:40 UTC
Site updated at 2012-12-05 04:12:02 UTC
iphone page form styling
Merge branch 'master' of github.com:solvingtheweb/nuance_dragonassistant
Fixed image in index.html
aaand make
This shit works now
work on new post
goodbye swap file
Doy. Removed a debugging echo statement.
Change a Few Things to Start
support for nonstandard image sizes in imagerolls
Computational Geometry, Triangles
Playing with the badge
release 20120502
release 20120502
initial CPS working
need to copy to vendor so that packages can be installed
use $BUILD_DIR variable
Updates are reliably URL encoded
test anchor3
Removed warning that was way out of date. I fixed that hack about a year ago.
Fix some cherry-pick.
Updated source/developers/documentation/scripting-apis/client-scripting-overview/scripting-with-javascript/widget-reading-writing/widget-content-reading-and-writing/lists-dropdowns.html.markdown
Basic layout set.
Site updated at 2012-09-30 17:57:23 UTC
Update binaries for android-4.1.2_r1

Change-Id: Ic5a0e83a8e40c4cd742556291f86e5e2a9e265ee
fixup init.rc

Change-Id: Ic90b9319123610f7705887007be3fa9a095f9b0c
cleanups

Change-Id: I7f2314e12ceb3a843b6671ca465250f4331451f5
Update notes for submitted changes

* Update Simple I/O Scheduler
crespo all teh things

updated pvr drivers from crespo 3.0 kernel
updated defconfig

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

Change-Id: I1aff07ef487a549c1c66b15029bdd4284a9d982e
Merge "PT-BR: Added Missing Translations" into jellybean
display build date and mod version in about phone
Corrected SMS acronym to be capitalized

Change-Id: I8ed68c1014fc40dc645d5c290ec33e1fb392647d
Update Russian Translation-Mms-CM10.1
Added and edited Danish strings in Mms

Changed "Hurtigt svar" to "Svar" because of limited space.
Added "Læst" so we don't have to see "Read" with Danish locale.

Change-Id: Ia879ffb09e50289cb9256261ed711847bd2c1e2f
version 0.3

user activities
fixed bug with initialization
Updated CHANGES
Bumped version number
display nb of ball
Updated README.md to include a bit more info, including usage instructions
msm: holiday: missing header includes
updated changelog with detail

I just updated the change log with the link for jquery mobile.
Proototype
Change name for "Visible Whitespace" to match what vs11 exports.
Major Update Agenda.

Major update agenda. Style aangepast.

Toelichting.

Functies aangemaakt om de datum te berekenen in mapje functies gezet.
o.a. Dag van de Week/ Dag van de Maand. Vertaald van Engels naar
Nederlands en afgekort op 2/3 letters bijv: Wo ipv Woensdag. Apr ipv
April.

Agenda rekent vandaag+27dagen uit.

7 rijen 4 kolommen.

Moeten nog even overleggen in verband met database voor mijn
beschikbaarheids weergave.

Als er dingen onduidelijk zijn mbt functies/klasses wil ik graag
toelichten.
Added test script.
Fixed a few bugs.
surfaceflinger: Silence warnings for missing earlysuspend support.

Earlysuspend is gone from the Android 3.3 kernel but surfaceflinger
still expects it to exist. Apparently this is know about upstream and
fixed, but this hasn't been pushed out into 4.0.x

We don't know what the upstream fix is, so for now we will change
the code to fail silently if the frame-buffer earlysuspend files
are missing.

This fixes LP bug #906210

Change-Id: Id1e30981ac1c94cc59b31515d51e52fbed9e88d9
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Fixed find and replace fail in license body
Added AutonomousSelector, and carved out new Autonomous setup. Updated ShooterSteeringThread to be constant.
UI Update 0.01
removing css files that shouldn't have been in the sass directory
renaming bootstrap css3 mixins to prevent conflict with compass css3 mixins
Fixing some line lengths. #6
Cleaned up more lines, fixes #6
adding pictures, #2
Added pictures to HTML, closes #2
Added photo captions. \nFixes #3
Subindo aplicação para o github
-a
implementing handlers
started filter-matrix script
refactored
refactored
use foreman for running tests
starting foreman now in rake
start foreman now in env.rb
Minor change??
Added more tests
Working on routes
Workingo n routes
I finished the boolean function and number function and still trying to fix my procedure. I also started the String function.
Signed-off-by: calamityjane <fabiennerondeau@orange.fr>
Signed-off-by: Fabienne RONDEAU <fabiennerondeau@orange.fr>
Add capistrano for multiapps
Working on wizard processes
Merge branch 'addWizards' into develop
PhpFile
allow config files written in json
Added Dato as a new model
Removing Region from models it was not necesary according to Manuel Aris
Changed message in home and added tests for csv reading all the data
Fix #239
Fix #239
Update Grid/Source/Entity.php
Fix #239 and Fix bug with mapped fields with mapping level > 2
Fix groupBy feature on multi level mapped field
Update README.md
Add DQL function support with non mapped fields
Fixed notice in renderCell from class ArrayColumn when using nested arrays.
 add options to configure the datagrid (ie pagerfanta)
typo in doc
CS
only pagerfanta options
pager fanta options
update doc
typo
Update Resources/views/blocks.html.twig
Update Grid/Source/Source.php

There's probably a typo in regexp when filtering text values with eq operator
Merge pull request #253 from ip512/patch-1

Fix typo in eq regex for vector source.
add reorder function for columns and change guesscolumns to take user defined columns order into account
Merge pull request #255 from ip512/master

Added method to reorder columns on Grid Class
Clarified dynamic roles and local roles creation
Update docs/index.rst

Added link to slides on slideshare
added SAI scripts for Borean Tundra zone
Added a brief section on Challenges
Mentioned provenance and interlinking in Challenges
Added some lessons learnt
Minor
Minor clarification to interlinking in Conclusions
Minor
Mentioned interlinks with Geonames
Tried to articulate the LD architecture diagram in terms of a pipeline / workflow
Minor
Added LD architectural diagram in context of case studies and contributions
modified:   BoardConfig.mk
	deleted:    README
	new file:   README.mkdn
	deleted:    cm.dependencies.ignore
	new file:   recovery/postrecoveryboot.sh
	renamed:    recovery-gfx.c -> recovery/recovery-gfx.c
	modified:   vs920.mk
Merge pull request #2 from playfulgod/cm9

	modified:   BoardConfig.mk
Mimicking EnchancedConfiguration's "possible, might be actual" bug fixes.
Small changes to code, added further control classes and options


Signed-off-by: Jozsef Kiraly <1020730@ucn.dk>
README issues
add new refactored clooj
Added events component
Deleted .SVN
deleted svn
added user position by IP
Missing hook HOOK_CREATE_ACCOUNT_FORM within guest checkout - prevents blockcustomerprivacy from functioning.
Merge pull request #15 from damonsk/patch1

Missing hook HOOK_CREATE_ACCOUNT_FORM within guest checkout - prevents b...
Need a little more space for /radio to detect SIM more easily.
Rebuild

Rebuilt everything following previous change
array building
logics is actually upside down
decoupled nav.php
enabled conference menu on generic nav
use fluid row for content
Corrected JMeter test plan
Shorturl in sidebar
Edit buttons on included pages on hover
Include action for sidebar
Fixed inline post view
Improved inline post view UI
Divers...
Ajout .gitignore
12/6/6 (Redesign)
Update arch/arm/mach-msm/board-gio.c
Added teams, commitees, and people
Updates
Clean up
Config settings
wqMerge branch 'master' of github.com:kimmellj/roller-derby-team-management

Conflicts:
	.gitignore
	app/View/People/add.ctp
Merge branch 'master' of github.com:kimmellj/roller-derby-team-management
Removing Database
Merge branch 'master' of github.com:kimmellj/roller-derby-team-management
fixed bugs
Merge branch 'master' of github.com:kurianw/CervezaInternacionalConverter
added AWS key id and secret key id
add jscolor to activeadmin form
split the screenshots in sections
renamed standarddrucker-nach-raum.sh to set-default-printer
QuickSettingsController.java: remove unneeded casts

mContainerView is final and always an instance of QuickSettingsContainerView,
as provided to the constructor. There is no need to hold a reference to a
super-class of it.

Change-Id: Iddca83bf9d251553d4ae9c2d2c54446336f16f6f
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
email label font-size update
now the formular gives the right paramter ti to thanks controller
Edits on the readme file.
I/O scheduler settings

Refs: http://review.cyanogenmod.com/#/c/23532/

This needs a change of permissions of /sys/block/mmcblk0/queue/scheduler
(separate commit project CyanogenMod/android_system_core)

Patch set: translatable="false"

Same as for JB: http://review.cyanogenmod.com/#/c/22127/

Change-Id: Ibb01cecff7712ad654242f616d0ecf99439471d0
ProcessWorkItemCommand - progress reporting
Update README with checkbox info
Lagt til html view for javascript gruppe
let static take filetype paths
hypowheel and lifestyle infographics
NXP-9301: adding availabilityFilter property to route schema to store the id of the filter
NXP-9291: better old/new comparison
Update : With a little pep8 from my friends
BST changes
Добавлена десериализация ответа на запрос авторизации.
p4vzw: add in the rest of P7510's XABLPL

-alsa, libsec, audio, macload and gps cert
-reference tf201 and 7510's XABLPL
-use sensors.p3.so from p4
updated the date example
fix icon views size
Updated ajax-functions.php to use do_action() for login / register fields
Checkout Form Validation

Name and Last name validation.
Merge remote-tracking branch 'pippinsplugins/master'
Updating Validation with a filter for required fields.
Adds sorting features to the payment history columns

Allows to order the payment history columns: ID, Date and Status In ASC
/ DEC mode.
Merge pull request #94 from sksmatt/master

Improves
Added an option to allow the purchase email to be updated for any payment in the the payment history
added a basic login form short code
clean up
clean up2
fixed bugs in js
break seed task into production, minimal, and full
automatically make us admins.
Merge branch 'master' of https://github.com/presidential-innovation-fellows/rfpez
Add Braulio's bio
added device media make files
Small improvement in code
Version 2.1.8: fix translation
Merge branch 'master' of github.com:rilwis/private-messages-for-wordpress
Version 2.1.9
all demo code now moved to rocon_gateway_demos.
Update for Bp 1.6
Pointing to the existence of the guide for whoever finds the repo.
Inconsistencies updated
graphs keep rolling on load test - need to figure out how to scale
the chart over time or truncate it every so often

Signed-off-by: aidancasey <aidancasey@gmail.com>
Got the ChildScreen working.
adding pagenotfound module
removing CHANGELOG files and some outdated modules
updated license
Rebuilt classes
Updated settings partial to reflect recent changes to apostrophePlugin
background color #3240ff
Set safe GCC env vars for building against R libs
AggregationActionTests.newTests fixed
averageThroughput removed from Constants
Constants file cleaned up
Globals cleaned up
WebsiteDetails  cleaned.
DEBUG_MODE variable added
Check facebook login first
Add paginator subclass to work with Django's built in pagination mechanism
Aggiornate immagini ribbons
porting code ready for test
rApache demo requires Hmisc
rApache demo uses Cairo
added demo installer
YaST2 web server tools
ditched mpich2 - didn't help
presentable guest checkout development and testing
fix typo

Change-Id: Id9deb0b91c4bb81ecb4200b9b5ef731c85db4ced
Prevent spawncamping
Twitter Working
added alias_method support
Merge pull request #1 from CM9-D2G/ics

Clean up repo's since most of this is across all 3 devices should be
Remove ugly hack module
http://wireless.kernel.org/en/users/Drivers/wl12xx
Fix the rest of camera flash
disable compcache service
Cleanup for common
Add our hijack packer back in
Revert "Cleanup for common"
This caused tethering issues
This reverts commit 7fde221802d894fd40288e5360c17f103db13a59.
Less verbose startup
cant remember what i changed here....
Update notes for submitted changes

* hallon:Change branch in cm.dependencies to jellybean
hallon: updated proprietary-files list
Update notes for submitted changes

* iyokan: filler2 increase
Added rails g scaffold post title content:text
rolling up to version 0.2.5-SNAPSHOT
changed some-file.txt
Revert "d2: add newer adreno blobs"

This reverts commit 1dcf4a7ad6bb0d60a8b2b04f4cd0dcdbdf1f01d7.
Increase the aspect ratio tolerance

If the only widescreen preview size supported by camera is 848x480,
for 2592x1456 wide pictures, the tolerance has to be increased to
0.014 to get the desired wide preview match.
(848/480 = 1.7666; 2592/1456 = 1.7802)

just merged this ics commit:
http://review.cyanogenmod.com/#/c/16788/

this fixes preview ratio on htc saga

Change-Id: I7ac9702cc48368c1408f2650342f5be63a547e45

Conflicts:
	src/com/android/camera/Util.java
Revert "camera: Focus fixes"

This reverts commit fa4bddbddde9d7456c7fd56e3fb96e72c5e03661.
shorten the focus delayed time
Team Travis builds for this project are optional
change to date instead of datetime
Merge pull request #9 from athal7/date-fix

change to date instead of datetime
Merge branch 'master' into MikeSilvis
fixed == for merchant#relationships
Merge pull request #10 from nisargshah100/master

Fixed the == error in merchant_spec
Merge branch 'master' into MikeSilvis
add sencha to icon asset generation
Unify config into packager.json
update packager
cleanup assets
move over to PhoneGapBuild
fixed padding issue on search count
added padding to bottom of home page
Added meta tags to prevent some phones opening dialer
add Analog folders to .gitignore.
add build instruction to readme.txt.
Customer-specified RNG removed

The random number generator provided by the user runs overwhelmingly
slowly and its running speed increases linearly as the program runs.
This proves impractically slow for testing, and simulation tests using
the RNG provide correct data, so it should be good to get rid of.
Legacy code left in but commented out, should it be required at QA time
to ensure the world is still simulating as expected
Add theme chooser to settings
Clean up and rearrange and add Volume Rocker wake and volume music controls
set up for capture.
getDeproxiedClass does not work right in OpenMRS 1.9 - META-226
Merge pull request #2 from djazayeri/master

getDeproxiedClass does not work right in OpenMRS 1.9 - META-226
adding blog post: github for the win
Update _posts/2012-12-13-open-learners-material-github-for-the-win.md
Merge pull request #17 from ligthyear/github-for-the-win

adding blog post: github for the win
typos, apostrophes
Toinen esimerkki neliöksi täydentämiseen.
Merge branch 'master' of github.com:Oppikirjamaraton/oppikirjamaraton-maa2
Merge branch 'master' of github.com:Oppikirjamaraton/oppikirjamaraton-maa2
Ensimmäinen vaillinaisten toisen asteen yhtälöiden alaluku kuntoon.
added testing frameworks
Merge branch 'master' of github.com:PatrickHeneise/nodejsbcn-bcnstartupmap
tests added
added tests and doc
Add -interface option, fix indents, remove debug print
Revert "Backlight settings (require unmerged frameworks commit)"

This reverts commit 41527fed209875020262b369abc2c49aff129001.
update Haml files used for Devise
Added automatic line break to chat
Fixed uri build out

Fixed a bug in building out the urlElements array in the URI component
fixed graphics issues, as well as buttons
doing some styling -MM
Merge branch 'master' of github.com:SpencerForell/Study-Participant-Portal
Merge branch 'master' of github.com:SpencerForell/Study-Participant-Portal
Did some CSS styling with background colors, fonts, and gradients. -MM
Move version declarations into root build.gradle

The Artifactory-based release process automatically updates the version that's
declared in gradle.properties. Unfortunately in doing so, it also removes
formatting from the file and  reorders the properties. To work  around this, we
now only declare the project's version in gradle.properties. The versions of
the project's dependencies are now declared in build.gradle where they will be
unaffected by the release process.
Merge branch 'version-declarations'
Update user guide links
Merge branch 'download-links'
fix background for post
version, alpha-3
wl12xx: don't send the sleep_auth to FW on recovery

The FW doesn't seem to handle it gracefully, and it's redundant since
recovery will make us load a new FW anyway.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
wl12xx: disable arp filter only if configured

Disabling auto arp actually causes FW resources allocation
and it's better to avoid that unless an arp filter was
already configured (i.e. the interface had an IP configured).
This also prevents exceeding the FW arp filters limit (2)
in certain scenarios. Once such case which poses a problem
is having a P2P_GO with an associated client + a connected STA
concurrently. Once you disconnect the GO, for a brief moment
the interface is changed to STA before removal. This leads to
having 3 STA interfaces (the actual STA, P2P device and the
disconnected GO which turned into a STA) and would attempt
allocating 3 FW arp filters which fails.

Signed-off-by: Eyal Shapira <eyal@wizery.com>
board-endeavoru: remove obsolete includes
endeavoru: properly patch wakeup system from GPIO_PU6 without key detection v2
config: update tripndroid jellybean config 013A
drivers: input: touchscreen: synaptics_3200: cleanup driver
htc_battery_tps80032: cleanup
board-endeavoru-panel: remove tegra_gpio_enb/dis
board-endeavoru-power: remove tegra_gpio_enb/dis
board-endeavoru-sdhci: remove tegra_gpio_enb/dis
board-endeavoru: remove tegra_gpio_enb/dis
board-endeavoru-baseband: remove tegra_gpio_enb/dis
tegra_aic3008: add support for AVP rendering
board-endeavoru-power: properly implement a gpio for pmu msecure
board-endeavoru-power: limit the amount of regulators enabled at boot
board-endeavoru-power: properly setup sdmmc3_vdd_sel gpio regulator
media: video: tegra: fix typo within makefile
board-endeavoru-sensors: simplify cm3629_enable_power
board-endeavoru-sensors: remove tegra_gpio_enb/dis
lightsensor: cm3629: increasing polling_delay for als
bem ta ai a pagina retornando as paradas
removed global visibility
* v1.0.8 of old plugin
Array Version
Lock Flag/Memset
Fixed Flag
Confirm
Sizing Fixed
With room for Null
Fixed Flag Reset Position
Working Module
Cleaned
Removed unused variables from the CBAPI class.  Updated the README file.
Design with state machine
more header madness
Upgraded "favicon.ico".
removed vim swap file, added spec for spring security
made several modifications to example.htm. Given the plugin a new name and soon a home page where it can downloaded.
changed paragraph text to SCREW DEFAULT STUFF section
added some changes to media queries and content in example.htm
Because this will likely be used locally only, a local jquery include makes more sense.
relocated css files to css folder.
renamed debug js file too woodcuttr and relocated to js folder.
modified readme to reflect example.htm
renamed example.htm to demo.htm
removed sprite.png
renamed debug css to wc-default
changed css debug file to wc-default.css
added wc-apple.css
added wc-apple.css with several Apple devices. Includes the latest iMac, MacBook Pro Retina, and iPad mini.
added js min file. cleaned up demo.htm and .css
Post-merge cleanup and instructions for native iOS/OSX SSL support
Pagină despre.
Modificări:

* am adăugat bootstrap și jquery la șablonul implicit
* am creat un "tag" pentru crearea ușoară de ediții
* exemplu anunț: editii/6.md
am eliminat un div in plus
Șablon pentru editia 6
exclude the script for easy to use on custom sites
Modified BestFirstSearch to not care about plan quality.
Site updated at 2012-10-26 21:34:23 UTC
adding reference to web dev intro
Moved $efile === '.' check to an else if

and removed a comment
Site updated at 2012-10-04 20:42:02 UTC
EPGY fix new problem
use a cname, stupid
Updating posts with images and matching permalinks.
Changing the name of the application
Typograf quotes has done
rename mk files
Undo bad README merge
require-handlebars-plugin submodule
Updated the section on automatic memory limits computation in the "Deploying With Chef" tutorial
Emphasize the benefits of “update, sync, run, repeat” pattern in the "Deploying With Chef" tutorial
Merge pull request #13 from ellemenno/master

release 2012.08.24 (v0.8.0)
* adding rel-2012.08.31 (v0.9.0)
merge from canonical
Advanced version which allow you to add navigation
Merge branch 'master' of https://etiennetremel@github.com/etiennetremel/jQuery-minimal-Slideshow.git
Creation of the gatling-jenkins-plugin.
Merge pull request #1 from excilys-blemale/squash

Creation of the gatling-jenkins-plugin.
Merge remote branch 'upstream/master'

Conflicts:
	src/main/java/com/excilys/ebi/gatling/jenkins/GatlingBuildAction.java
	src/main/resources/com/excilys/ebi/gatling/jenkins/GatlingProjectAction/index.properties
	src/main/resources/com/excilys/ebi/gatling/jenkins/GatlingProjectAction/index_fr.properties
	src/main/resources/com/excilys/ebi/gatling/jenkins/tags/import.jelly
	src/main/webapp/js/jqplot/jquery.jqplot.min.css
	src/main/webapp/js/jqplot/jquery.jqplot.min.js
	src/main/webapp/js/jqplot/plugins/jqplot.cursor.min.js
	src/main/webapp/js/jqplot/plugins/jqplot.highlighter.min.js
	src/main/webapp/js/jquery.min.js
Update _posts/what/2012-10-3-the_pieces.md
Fixed version to 1.0.0.BUILD-SNAPSHOT
Fixed Spelling Error in README.md
removed debug symbols
2.2.2.0: decorated the Entity base class with a DataContract attribute
cleaned up datasource to use hsqldb in memory db
PIN Number / Quantity / Price dialog implemented
- still need to make it parameterised (ie for the different uses)
Initial commit
Ready to publish
Removed EOL whitespace from script.coffee
Added CNAME as per http://help.github.com/pages/
minor additions, fixed typos
Master is back "master" (and not 2.0)
finish section 11.9 Sorting Algorithms
fix bookmarklet photo picker and a stupid mistake
BUG: CRITICAL: daily rotation of counters was never launched the first time, so... never in fact
Add "update" to bash auto completion
Add recursive update ability

Allows the update command to be updated + removed refusal to check for
updates if the versions are the same.
Bump version to 0.8.1
try to add gallery description to item
Increase database r/w units and other testing stuff
Merge remote-tracking branch 'origin/master'
AWS Core SPs
Merge branch 'master' of github.com:nazdaqTechnologies/ndap-magento-nazdaq
added related page title
made group pass categories to connected events
wrote script to sort out member list grid
Correct the usage example in the README .
Bump to v1.0.1 .
Site updated at 2012-05-18 15:51:08 UTC
Trying to call MySQL setup script on Travis cont.
One more dialog to bootstrap
File domain model file and class names
Initial approach at TCA generation
ion: init
enabled textures
Check for update work
Rebase from 'release/moveit_setup_assistant' @ version '0.2.4'
Generated debian files for precise
Added before_script to hopefully fix Travis error
Updated with completed data from CAH pdfs.
Merge pull request #22 from mx107marlin/patch-1

Original CAH DB is completed. Next up is Expansion Pack 1 if we want to take that on right away.
Don't push CNAME yet.
Update spejchar/index.html
Implement array code generation
Write implemented
jenkins deployment testing
cosmetic 6
Simplify instruction and make more robust (will survive reboot).
Updated onDomReady function to work correctly with IE 9
Site updated at 2012-08-06 21:50:37 UTC
french: fix profile connections entries
Added basic delete function and language for delete action. This method does not check if the delete succeeded.
Incremental commit in case of data loss
Incremental commit in case of data loss
* First jekyll-ready commit, expect errors...
Merge branch 'master' of github.com:wafflesnatcha/wafflesnatcha.github.com
Fixing the random merge from outta nowhere
Localisation updates from http://translatewiki.net.

Change-Id: I7db9d90d52f90ae19f1f19f5e9aba195aa88d62a
Report more information for selser testing

Run the unit tests with --wt2wt --selser, and there should now be a report
in the output that tells you which selser tests passed in wt2wt, and which
ones failed in both but had different output.

Change-Id: I744acb19768c353e7a50328d7797a2c8a8452539
Merge "Report more information for selser testing"
Localisation updates from http://translatewiki.net.

Change-Id: Ib3f0b368548559b52dce6310f5ed2c9b437c4dad
fixed some really dumb things
AW2012 homepage edits JF
AW2012 frontpage edits2 JF
Following mateorod, moved some of the surrogates from the framework core to the telephony library where they are used
Fixed build problems
Found a work around for HDL Coder crash. Tested the Verilog in Modelsim.
So everything is working now.
Fixed scaling_max_freq resetting on screen_off

Change-Id: I39a38082a07263baf9f58e6951e26f1f8d745dc6
coconut: Torch uses camera interface
coconut: prebuilt kernel update (new pmem)
Update notes for submitted changes

* Port Russian Translation from CM10 to CM10.1-Phone
fixes

Change-Id: I9a4d26b86933f7df97d53a9801cbc538f8e5dc8b
vistas de compra de articulos a ingredientes
Merge branch 'master' of https://github.com/Ingenieria-del-Software-UNET/Le-Maximun
Implement DS edit registry
Merge branch '7.x' of github.com:Islandora/islandora_content_model_forms into 7.x
change version to "3"
added instructions to simple example
Remove pointless whitespace! 

White power! (no racism allowed)
Added receiver name into settings for receiver, and modified necessary code to get receivers to use it.
Fixed bug where subscriptions with the same name could throw an exception, despite comments promising not to.
merged
Updated to latest NuGet packages.
Added ability to set the receiver timeout. Removed wrapping region for single interface class impl.
Tabified two files that had spaces.
Whoops, was missing a new implementation operation in an interface.
Merge remote-tracking branch '5pm/master' into 5pm_named
removed .nuget folder usage and nuget target, because it will break MassTransit.TransportSpecs project when trying to compile out a non-ordinary folder. The problem is that doing it this way weaves nuget too tightly with the compilation process; I prefer if that's outside of the msbuild process where one can change it if one wishes to.
added ignore on the test that I'm currently at and downgraded nunit so that tests can run again
Merge branch '5pm_named'
Fix /etc symlink for media codecs config

Change-Id: I2a7a666f5d3b8850fc40ac654833becd7e6a826b
Disable unnecessary debugging features / improve security

Change-Id: Ie293dcbde9357a668eaea3418d262f76ab1a5020
initramfs: Fix typo

Change-Id: I970d32a8ca2fcffeedf26752c289db01476d101d
Added .suo to ignore
Merge branch 'master' of github.com:PA08-Mehl-Yang-Woldstad-Blohowiak/PA-08

Conflicts:
	PA-08/PA-08.suo
Use LegacyCamera if specified
Confusion matrix based error coputation function and clustering related expressions were added
changes for slim
Merge github.com:SlimRoms/device_samsung_galaxys2-common into jb
Processor: Cleanup upstream merge mess
Downstream touchscreen "hack" for updated drivers
Added check to disable moresell
Only salable products are now used in the feed
Updated readme file
Fixed stupid bug in search filter
Cusom vibrate patterns, kanged in from 855fd19a3d by Wes Garner, originally by mssmison, attempted cleanup

Change-Id: I5da9d4f075b8c273f6e84c75c2566c658bfcd897
Wrong styles
# Images folder Capitalized
# Updated depi file
bug fixes in graphing, buttons in matrices
ids/links on all h1, h2, and h3 elements for easy way to link to specific header.
Merge pull request #29 from connormontgomery/1.5.2

h1, h2, and h3's now have a way to link to that specific section
Rspec Added for salary group detail effective month
allowed creation of MODS through editor
flippedy flop pop
Added settings menu, added auto-update option
Code cleaned
Added Delphi/Pascal thanks to Chris McClenny (http://squashbrain.com/)
Fixed: bbPress posts showed Crayons on the bottom of posts irrespective of their position in the post content.
Look away
Look away part 2
Fixed small typo
Remove backup
I do not know
Use custom media_profiles.xml
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
Apn Settings : Fix panel title

Show appropriate apn editor title

Change-Id: I1f9dbce5dbf464db79d7c2fbedb8f833e4b46468
Merge "Apn Settings : Fix panel title" into jellybean
settings: Add option to toggle the pointer icon when using stylus

Change-Id: I11d027189d92452e42f26b9f1a3228c999a75bfa
Settings: Add ability to disable Power menu screenshot (Part 2/2)

Change-Id: I44f948bbd6b2b5c661f4fc6c765ea5308f266755
Settings: Add translatables

Change-Id: Ia31ef61c4d19c2b62e8f39fb020c8851fa34dea4
PT-BR: Battery status on lockscreen translation

Change-Id: I50eac14eb653de0dc4118b00275d42760d3ee642
Settings - Updated Italian translation

Change-Id: I5fafa694fbb778d473f7726a380b276cd071cff8
Add missing es_ES translations

patchset 2, 3 & 4: fix typos

Change-Id: I85f364d3aee124ec29b279d4e46e634d5a285780
Added hungarian translation for Settings

Change-Id: Idfd5750f99076475100bccac2c0f4723af1eadb3
Wifi: Allow to define the idle timeout (5 mn to 3 hours)

The setting key already exists in frameworks and is set to 15mn

This is only used when sleep policy allow to turn off the device.
Actually after 15mn, the driver is unloaded, and related services
fully stopped or paused.

Note: using the sleep policy can cause compatibility problems
with devices still using the old wpa supplicant (v6 or less),
In v8, ICS uses a new INTERFACE_DISABLED state for the wpa service.

Change-Id: I11953aab6e95bc3a2d5eaf1537acdf8a27701701
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Backlight settings (settings)

framework part required

Change-Id: I82e3e414e2cb00013ec4efcde64841893f493e3a
Hardware key custom rebinding (2/2)

Settings for rebinding the actions performed on the following key press events:
Home long-press, menu press, menu long-press, search press, search long-press,
app-switch press and app-switch long-press.

The available actions are: Nothing, open/close menu, recent apps switcher,
search assistant, voice search and in-app search.

Devices with a key configuration other than home, back, menu and search need to
set config_deviceHardwareKeys in an overlay to have the correct preferences
show up.

Patch Set 1: Initial port from ICS [done by Konstantin Koslowski]
Patch Set 2: Added 'assist' (search) key customisation
             Option for ICS-style in-app search, in addition to jellybean-style
             search assistant.
             Prevented list preference summaries misaligning in the event of
             their entries being reordered.
             Prevented a potential NPE.
             Moved strings.xml edits to CM10 section.
Patch Set 3: Checkbox to enable/disable all custom bindings.
             Home long-press defaults to no action on devices with
             an app-switch key.
Patch Set 4: Rebased

Change-Id: I2f53dc110638f906fcb18bb5f6edadbd465530ab

Conflicts:

	src/com/android/settings/cyanogenmod/SystemSettings.java
Update locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
Remove no longer used perl-external files.
Not needed as package, carton installs it.
Add Template::Plugin::DateTime::Format to carton (used by admin template).
Merge branch 'origin' from MySociety's FixMyStreet
fixed formatting

1st time I have actuallt bothered to format an MD file. Does it show?
Restored Android and Windows
minor changes in CmdImpl
Merge branch 'master' of https://github.com/collective-congress/collective-congress
Update once tested and failed
Trailer embed
Add Center Clock-Settings Part

o : Dont show the clock
1 : Right clock (default)
2 : Center clock

Patch Set 4 : Edit arrays.xml

Patch Set 5 : Big Mistake (Checkbox -> List)

Tested on LG Optimus One.

Change-Id: Id5b9a81131d425057aca9890bafcb33ac8260779
Add option to install BuildDeps or not
added edit workout
Update 2_snake/src/snake/work.clj
New: style.less

style.less is now compiled to style.css
Add link to the mail list on the README
Revert "Fixes: #817 moving /etc contents to contrib to be more correct for the mail plugin"

This reverts commit 4ebc5c7efbb0cc867934c304a7dd24e362d3de9c.

commited in wrong branch
Revert "Fixes: #819 removing the encoding file from /etc and putting it in contrib in the system plugin"

This reverts commit 2e3c0fc28e45786b7d12bcfba761b506917aaad8.

commited in wrong branch
Revert "Fixes: #825 Remove all non needed readme in the plugins"

This reverts commit 798be31cdc19715128c4a49cc6a651282bca16e6.

commited in wrong branch
Revert "removed non working urls"

This reverts commit 9eec9953dbb72201345edac10e562c9d32f097c7.

commited in wrong branch
Revert "Fixes: #843 file from the gofon etc/asterisk plugin should go to contrib/asterisk"

This reverts commit 8ee2141f5c2f5b14ffd6cfe53ce880739fe8234c.

Commited in wrong branch
Revert "Fixes: #841 [openstack-compute] - Mismatch in directory naming"

This reverts commit b343d333fdfc41d902b7f3744ec8ac0eda5b667a.

Commited in wrong branch
Revert "Fixes: #836 when creating a terminal it yell at me that wake event doesnt exist"

This reverts commit 3d4ce8592f872f6c65643899348c845038d08eae.

Commited in wrong branch
Revert "Revert "Fixes: #630 removing the code for kolab1""

This reverts commit d419a148c1c3c86f733d42aa2bbd3670e732fc3c.

Commited in wrong branch
Fixes: #739 we must create a service to store the config of all the argonaut tools
different tac for getting membership because organization/members/{any-valid-github-user} always returns 302
*boop*
Lightweight connections/bidirectional sockets

At most one socket pair (TCP connection) will be created per pair of endpoints.
Cleanup. Relax upper bound on network.
Support network-2.4.0
CORE-3113: shorten the job name for URL upload jobs
CORE-3110: modified the project to use lein-iplant-rpm to generate RPM files
CORE-3110: upgrade to Clojure 1.4.0
CORE-3110: use the curl wrapper script for URL upload jobs
CORE-3110: added the renci repository to project.clj
Revert 'CORE-3040: Replace "Analysis" with "App" or "Result" and delete some unused strings'

This reverts most of commit bfbac52a06f4052909634943695c33579b6d0472.
Unused constants and display strings were not added back in.
References to reverted names were updated in changes newer than that commit.

Conflicts:

	src/main/java/org/iplantc/de/client/ApplicationLayout.java
	src/main/java/org/iplantc/de/client/DEDisplayStrings.java
	src/main/java/org/iplantc/de/client/DEDisplayStrings.properties
	src/main/java/org/iplantc/de/client/utils/NotificationManager.java
	src/main/java/org/iplantc/de/client/views/panels/CatalogCategoryPanel.java
	src/main/java/org/iplantc/de/client/views/panels/PublishToWorldPanel.java
Refactor top level notification messages to GXT3
payment class
merge has_evaluation? and has_scoped_evaluation?
Refactoring: seperate method for each distributor website scrape.

Signed-off-by: Joe Baker <jbaker0428@gmail.com>
Add 7/19 class irb
Fix bug in doBatchDelete - was generating ODM code for Doctrine ORM.
better range slider options
Added Getting Started guide.
* Create the text domain function
* Name html5reset
* Create a few strings
* Move the <h2> tag outside the string
* Create the .po and .mo file
Fixed mobile viewport meta tag syntax

This commit changes the semi-colons to commas. The usage of
semi-colons caused iOS and Chrome to throw errors and not correctly
apply viewport settings.
There was a typo in "class" for the footer element
Merge pull request #23 from ninique/patch-1

There was a typo in "class" for the footer element
Merge pull request #22 from timnovinger/master

Bugfix: mobile viewport meta tag syntax
Merge pull request #21 from boddhi/master

Internationalization of the theme
Merge pull request #1 from murtaugh/master

Update to current master
Specified key name when signing jar
addt'l commits
Kikk festival
Multithread displaying of cached images (instead of single-thread)
Multithread displaying of cached images.
Introduced BitmapDisplayer, DisplayImageOptions.displayer() option.
Refatoring, created DefaultConfiguration factory. Made FileNameGenerator
an interface (instead of abstract class)
Example: Rounded images for list
v1.5.6 Update Readme
added readme in root
Front page template updates. Added function to validate the existance of a gravitar. Moved the buy the book stuff to a sidebar include. Adding the partner logos to the footer.
update the frame buffer window
Rename
Add ns chant
Add missing -*-
add ex44