labofsahil/github-event-dataset-2012 huggingface dataset:
add design considerations
Merge branch 'master' of github.com:mercadolibre/mercadolibre.github.com
add $mEV_threshold option
add option to specify image type
use auto_transfer directory instead of img dir; change 'img_type' to 'format'
'extend' seems to be the only helper I need to port from coffee-script
FIELDS
Merge branch 'master' of https://github.com/morganchristiansson/ajax_validations

Conflicts:
	app/models/demo.rb
expand on the STOP README
PMO-1871: added date column to header
PMO-2181 fixed
Move pattern base to claims model instead of historic claims
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/conf/BuildConfig.groovy
updated textmate url
doc
doc
update release
Readded Dataset
Add doc strings
Change references back to packages.

Maybe I need to create a separate project for compiling on Windows...
Remove unused variable
Add new method parseCompilerOutput

The functionality in this method used to be directly in the 'compile'
method.  This is the first of step of breaking the 'compile' method
into smaller chunks making it easier to test.
Add _spawnCobraCompilerProcess method
Change the parseCompilerOutput method from public to protected
Correct a misunderstanding I had of the ability of 'test' methods to access _methods

I thought that protected methods were not accessible inside of a
test method.  This is not the case.  This change moves the relevant
test methods underneath their respective procted methods to improve
readability a little bit.
First pass at using the build options set in the GUI when compiling
Add support to target specific platform such as x86

This might help with the debugging issues we've been having with
Windows 7 64-bit.
Add special handling for embedded resources on Windows
Starting headless on display 100
Change to "date_chooser"

date_picker collides with recent Formtastic versions, so try to
name this something else.
Update rabbitmq_producer.py

Generalized default user configured variables.
Updated .htaccess for w3 super cache
GPS settings toggle
Update transition summaries to show string entries instead of array values

Change-Id: I78864828dc4432442107f0d0f358eac6a731ba8d
add some res files
standardized for image in person profile
Facet filter was using a static field named date instead of the selected field
rough content
remove license
reduce lumbar.json to bare minimum
ensure npm install is auto run on first npm start
add base.styl
remove generated public files
0.10.3 Works
Site updated at 2012-04-11 15:56:59 UTC
tf-idf calculation mapreduce, not finished yet
add middleware to enable "lvh.me" domains even when it's down
Swapped order of numeric lists for consistancy (issue #16)
Added Lightening and Motion Triggers
Corrected bugs relating to infinite time-lapse
Support use in multisite networks
kuvat luonnoksien alle
I added Signup steps 1 and 2, although 2 isn't working correctly.

Learned a bunch about the framework, still have some work to do.
change in package structure
Catch ValidationError properly on the json interface pages
updated documentation
updated docs; changed service type to oneshot

changed service type to oneshot due to simple type causing systemd to
report incorrect service status
Changing a string concat from + to <<
Localisation updates from http://translatewiki.net.

Change-Id: I8f3c29a593e77aa01d362f7495155c2457280043
Merge remote-tracking branch 'yz/master'
Update content.
Merge pull request #7 from xhacker/master

Update Content
Fixed AMD definition of bootstrap-carousel library.
d2-common: liblights

Fix pinkish hue when color is set to white

Change-Id: I95a8bb35fafcbb85b9ab3600516ae756e886f5df
d2-common: enable device options in settings

Change-Id: I1fd4152f04e20d1f1ec0c698f7ee05cfe239ed0e
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>

Conflicts:
	overlay/packages/apps/Settings/res/values/bools.xml
added shebang to scraper
Update notes for submitted changes

* haida: updates for 4.1.B.0.431
Update notes for submitted changes

* mango: typo fix
Update notes for submitted changes

* zeusc: kernel update cam fix
set product lcd density
ps2: clean leftover on boardconfig.mk

Change-Id: I981093ce747ce69f3f776f10c741a78d2c432392
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
To be able to run in windows, add sdf according to os
Using the previous utils
Add some exception classes related to modules, to add additional info on top of current exceptions
Using newly created exception classes
completed 3.3.2 all tests pass
forgot to add pagening
Update German translation for settings

Patch set 1 - Add Safe headset volume added with
              http://review.cyanogenmod.com/#/c/16446/

              Add Background customization added with
              http://review.cyanogenmod.com/#/c/16914/

              Add Stylus settings added with
              http://review.cyanogenmod.com/#/c/17072/

              Add option to hide IME switcher added with
              http://review.cyanogenmod.com/#/c/16085/

Patch set 2 - Change wording & remove extra comma

Patch set 3 - Adapted wording

Patch set 5 - Changed wording & deleted whitespace

Patch set 6 - Removed abbreviation as suggested by Patrick

Change-Id: I8495202481fcc0183ee73ea2e89b249833f73b13
Merge "Update German translation for settings" into ics
Merge remote-tracking branch 'cyanogenmod/ics' into ics
ROMControl: Add weather settings back

p2: cleaned up xmls
p3: added sound fragment back
    cleaned up angry red boxes

Change-Id: Ib7df8268ad99253606df65899e82d5238a1ceb31
Signed-off-by: Roman Birg <romanbirg@gmail.com>
RC: Flip Vibrate updates

Fixed battery drain - with rate decreate & sensor unreg after screen
 off timeout
added user customization for down threshold
added user customization for when the listener unregisters
after the screen is turned off
registers back on when the screen is turned back on still using the same
variables as when it was on before

Patch Set 1:
- Still working some kinks out, wanted to push for a battery drain fix

Patch Set 2:
- Battery drain fixed!  also should help with settings being changed in
your pocket with it turning the sensor off after a user specified time.

Patch Set 3:
- Fix spaces because roman is a nazi

Patch Set 4:
- Minor tweaks to the Sound page + not allowing the listener to enable
if you have no action set.

Patch Set 5:
- Fix all nasty red stuff....

Change-Id: I392939e12e37e4ec947c2aee298f78a35f079277
Signed-off-by: Adam Fisch <adammfisch@gmail.com>

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml

Conflicts:

	res/values/arrays.xml
Add Performance Settings to ROMControl

This commit readds:
Fast Charge support
Minfree Settings
Voltage Settings
CPUSettings

Patch set 2: White space fixes...

I probably broke everything.. #blamexoomdev

Change-Id: I3ab73775937467e4ba03b39a5d1d21a93c9a7870

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/aokp/romcontrol/service/BootService.java
Statusbar transparency (2/2) - CM

ported to AOKP

added 2 more steps: 37% and 63%
not working for tablets (missing fwb part)
TRIVIAL adapting changes to skeleton
fix heroku
trying to fix heroku version
slight view tweaks.
new heroku version
More mods to get block reduction down
Added Config

Added config file to build kernel in CM9 during build
Changes to header.php and CSS for wordpress theme

As per Morley
.
Merge branch 'master' of https://github.com/OpenSourceConsulting/athena-chameleon.git
PDF 생성을 위한 분석 결과 Data Object 정의
Cleaned up bad model
CSproj commit
Merge branch 'master' of https://github.com/PatrickMcAfee/InfoSys-OrgCouponSystem
Removed bin files, added Org info
Run jekyll in the appropriate dir for our app.
added handleDeadObject()
Fixed README-Renesas for default configurations
remove alias require from all other files
Initial Checkin
Adding .travis configuration
Polish translation update

Change-Id: I5819e3210e965a280f81ce0140eb40dc08db8143
Update Japanese translation.

Change-Id: I8097d19f027bfaf671b92b8573cc8e7e2d674211
Adding option to use/unuse the LED for notifications

This setting allows users to decide per account if a notification activates the LED or not.

Change-Id: I3f53b9ae1df8216c1510e9072b8f25ae8583e26c
Don't reset recipients when loading draft.

Previously, if you choose to 'reply','reply all' or 'forward' a message, then
saved a draft, when loading that draft, the 're:'/'fwd:' beginning the subject
title would cause the original source message to be re-analysed and the new
message's 'to:', 'cc:' & 'bcc:' fields to be wiped & repopulated. Definitely
not expected behaviour.

Reverts an edit from 626ad1929d63b7dd0017373939a7cf6f91c98de9

Change-Id: I5f06ebc596060fb48ffa1b2ecc41f6620a55ade7
Merge "Don't reset recipients when loading draft." into ics
Merge remote branch 'upstream/ics' into ics
Update d2 blobs
Merge pull request #87 from Tortel/ics

Update d2 blobs
qcom: Update proprietary libs from CodeAurora

Change-Id: Ib0ac30977ac4a24548aace380da906ad9c13bf08
CLEAN UP FOR HEROKU
Add Wordpress subrepository
Checkout Wordpress 3.4.2
Adding default wp-config.php file
Adding default wp-content directory
Adding index.php
Pointing index.php to the correct location
Update settings in wp-config.php
me
added gitignore
bedtime update
Added ToString override
Updated MenuItems getter to return a new instance if it is null
Added additional constructor
Updated getters and added a Menu property

getting a property will now return a new instance if it is null
Updated with more Messenger registers and checks
Updated the Messenger instance
Added current menu and order item properties
Updated the error popup notification with more messages
Implemented the Cancel and Create Order button commands
Initial commit
Implemented error checks for non numeric keys
Initial commit
Implemented the item source and selected items
Removed testing code, updated customer info check
Added NumericTextHelper class
シェルスクリプトパスとhtaccess修正
Added redmine 2.x dependency
Increase buttons size
ARQ-1170 Updated Selenium and OperaDriver versions
Update googleScript/Code.gs

Agregue funcion enviar al correo
Merge pull request #3 from vidasaor/master

Envio de correos
IE9: js error when closing the popup.

Steps to reproduce:
1. Open demo page in ie9: http://demos.badsyntax.co/tinymce-jqueryui-popups/ 
2. Open 'Edit HTML Source' popup
3. Press cancel button
4. JS error happens

The root of the problem is jquery's dialog destroy method. It removes iframe from dialog element and places it into document.body. This causes iframe to reload.
Update jqueryinlinepopups/editor_plugin.js
Merge pull request #8 from cartmanez/master

IE9: js error when closing the popup.
Message Handlers update
I did not read the entire question; changed the code in order to include
methods to calculate the different outputs.
[Webbynode] Rapid App Deployment Reinitialization
4 commit
1. Added getFontInfo method and fontchanged event
2. Fixed typo of event names for languagechanged and regionchanged
updated error message
Added more test cases, updated check to be more explicit
Warenkorb um Summe der einzelnen Einträge erweitert
remove beforeRender return true
Tinymce : margin top
Correction bug définitive
removing doc files
iHeartRadio Connector

Added ability to scrobble from iHeartRadio
options page updated, added whats new section
Merge remote branch 'iheart/master'

Conflicts:
	manifest.json
	options.html
Remove EigenHelpers submod.
Need to move EigenHelpers and ITKHelpers into PatchProjection submod.
Can't host the html, or a bookmarklet link on github... Will post to blog...
Modify permissions for framebuffer debugging
add the original installer to the repository
Adding a point about Bifrost-Pages being built on Bifrost
Workaround for device assertion

Change-Id: Ib431e8f1dc4168f1ce393b5a254c8ef16a0effae
Workaround for SD card partition of Hong Kong devices

Change-Id: I5ce0b8861f925b1c4f3224f63278fa5615974589
Git & Travis referenced

Git and Travis are referenced in the continuous integration board.
Admin Modification
Merge branch 'master' of https://www.github.com/emersonbarrion/courtreservationonline
Fix in-call audio bug

Copy snd_soc_msm_2x from hardware/qcom/audio and adjust the DMIC Endfire
and Line sections.
Build Motorola binaries from source
Fixed a bug that could cause no photos to show up when searched for on iOS 5
test
fixing conflicts
Updated file motion_4096.bin
Modified proto files, Initial position of the servos set and limit corrected
Corrected indentation issu in the proto.
Modified GaitManager to work from any initial position.
Modified sample, to work with new initial position.
Adjusted position of the robot in the examples world.
Updated servos limits the LegLower.
Replaced getCM730->... by mCM730->...
Make the BulkRead only if MotionManager is not enable -> save time.
SyncWrite only servos that are enable and not use by the MotionManager.
Merge pull request #55 from DavidMansolino/ImproveRobot

Improved Robot class
Merge pull request #53 from DavidMansolino/InitPos

Modified initial posture of the robot
Merge pull request #54 from DavidMansolino/UpdatedServosLimit

Updated servos limits of the LegLowers
Add dampingConstant for each servos in proto.
Merge pull request #57 from DavidMansolino/damping

Add dampingConstant for each servos in proto.
Added camera_width and camera_height in the section Robot_config of the 'config.ini'.
Modified camera module to allowed differents resolutions (more resolutions will be added in the furtur).
Updated Robot::LoadINISettings to load the camera resolution from 'config.ini' in the Robot constructor.
Fixed small indentation issu.
Reseted camera resolution if resolution selected is not supported.
change to http instead of https
Esqueleto de clase - default access
Now list out IPN notifications in admin interface.
Renamed _gateway partial to match new PayPayPaymentMethod.
Merge branch 'add_pay_pal_payment_method'
Dialog and PrefsController
Merge Conflict resolved / Dialog and Prefs Controller
Remove unused files
Add gitignore
Themingé
Site updated at 2012-05-06 00:38:29 UTC
Corrections to Vulpecula
Merge branch 'solarsystem' of https://github.com/hewsmike/Einstein-At-Home-Screensaver into solarsystem
Minor correction HUDContainer class
Higher level build script

Keeps source consistent across targets
Reduces need to clean and re-download sources on target change
Takes essentially the same arguments as build.sh
Creates if needed a subdirectory for each target type
Copies existing source, build script etc to said subdirectory
Invokes the build script for the given original arguments
expand radio partition for modem.bin for SC-02B.
Show debug status for modem.

You can get it from /sys/class/modemctl/msm/debug.
Added tests.
Add .gitignore
renaming a folder, cleaning up things.
renaming a folder, cleaning up things.
Fixes so we can configure Trebuchet settings
Generic return types
Add ability to specify the Encounter Type from a specified list of
Encounter Types while filling out an HTML Form - HTML-88
showCommentField and showAccessionNumber for obs - HTML-62
includeIf velocityTest: evaluate the $patient.age as a number doesn't
work. - HTML-176
fixed debug mode relationship error: HTML-362
Relationships are only saved if in DEBUG logging mode (cherry picked from commit 6f96297)
Fixing htmlformentry to build on 1.8 profile
Removed the web references in the api pom
Reverted earlier change to the main pom that I was testing (cherry picked from commit de9cde4)
HTML-363: Remove log4.xml from src/main/resources
Merge remote-tracking branch 'wluyima/master' into wyclif
HTML-364 Support an option that lets you export HTML Forms via
metadatasharing without including any concepts as dependencies
Unit test for HTML-364
Merge remote-tracking branch 'upstream/master'
ignore .settings folder
reverted back the changes done to RelationshipSubmissionElement
Merge pull request #23 from djazayeri/b6f5d980890a4717b52d7154468328e460bd98e0

HTML-364 - Support an option that lets you export HTML Forms via metadatasharing without including any concepts as dependencies
Merge remote-tracking branch 'origin/master'
commiting encounter type merge
HTML-186 - JavaScript helper methods are not available on "Preview Form
From File" page or on the preview pane when editing an HTML Form
committing back the encounter type changes after resolving broken tests
Applying changes as per review comments for: includeIf velocityTest:
evaluate the $patient.age as a number doesn't work - HTML-176
Follow up to View schema is broken for html previewer - HTML-121
correcting the issue of non standard options getting entered via autocomplete widget
Revert "hwc: Support VSYNC notification via sysfs"

This reverts commit 0d47bc4df5de25b8232a3c297a96d8def5e206af.

I suppose we'll use CAF's version.
generateProperties for appender
PBR-458 Metamer (portlet): a4j:actionListener: multiple listener invoke causes ERROR status
Improved Resource Externalization handling
check if trunk still read only

git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@44617 a97e2381-89e5-4abb-bab3-167db6db766c
update README.md

git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@44618 a97e2381-89e5-4abb-bab3-167db6db766c
added username to user along with authorization via username
removed cucumber references
removed views that are present in the devise gem that I dont customize
removed unused gems
changed name to DeviseWebapp
Actualizacion de Carpetas
role back dir change
Added factory methods for Artist API Client and registered Artist API Client as Service
pepocheando para hector
First version. Wrote the algorithm in Evernote. Will deploy tomorrow
Minor mods. So tire-zzzzzzzzzzz
Continuing to work on the save_to_watchlist method. Almost theregit add ../stock/models.py
It's not pretty, but it works. Finally. Performance tuning this isn't going to be fun
Various work to the ranker algorithm
Fix not up to date docstring
PT-BR: Added missing translations

Change-Id: If52670b7ff9b4307bee670cdce14838ac62310f6
AudioService: Don't adjust volume when vol-downing to vibrate or silent

Pressing vol-down to vibrate or silent would (previously) still adjust the
stream volume, setting the last audible volume to 0, which is not allowed
for voice-capable devices.  Thus, the last audible volume would reset to
default on reboot if on vibrate/silent or the lowest volume setting.

By not adjusting volume when vol-downing to vibrate or silent on
voice-capable devices, the last audible volume is always preserved across
reboot.
Merge "PT-BR: Added missing translations" into jellybean
Merge remote-tracking branch 'origin/jellybean' into jb-cm-linaro-strict
Revert "Allow title translation"

This reverts commit de156932629444bc30bdbbc75c5cc1e1871ad32a.
Revert "Updated echo_trans"

This reverts commit 64c777fa3d466d0d1e123e3c31df3edb2b5b5c17.
Add convenience function vehicle_fn_ticker10
#94 v2 firmware re-work for multiple vehicle support - work in progress (net_sms != null bug)
Switched to apache name
Updated front camera data patterns to match stock
fix boot recovery
Organized imports due to AndEngine changes.
added position:relative; to slider element
Showcase text, update kinect library
all the work from this weekend
NXP-9914: task name should be translated on the summary page
NXP-9921: dinamically compute the task dueDate from a mvel expression
support internasionalization
added update documentation - Thanks Pankaj
Fixed possible with add-ons feed
Updated eventcloud development versions due to release
Fix phone still ringing after call answer
Start adding PostgreSQL layer

We will start tracking students' progress through the curriculum
Phone: Add transparency to incall screen

Change-Id: Ie366d3bcdb38c497e89848f8534f7f1af317a9fa
remove color overlay in incall touch ui
Update README w/ detailed API
Merge pull request #5 from mfenniak/master

Improve README
De-duplicated some code and cleaned up some tests.
Added LICENSE file and minor tweaks
Make {{else}} un-indent the current line, but re-indent the next line.
Add typing pairs for strings inside Handlebars tags.
Change scope for empty braces so that it doesn't flicker when you expand a snippet.
Add support for snippet expansion and talking to tm_dialog2.
Rewrite "Open Partial" command to use `TM_HANDLEBARS_TEMPLATES_GLOB`.
Rename command.
Add "Open Helper" and "Insert Partial" commands.
Edit README.
gr
Merge pull request #3 from shanewilson/B1

gr
Removed all the debugging messages.
Changed package.json to upgrade socket.io to v0.9.x
fixed disconnect of users when long polling.
see #57 - add script to update pot file
see #57 - update pot file
Updated Czech translation (thanks: David Štancl)
fix #57 - update all po files - some translation required
Merge branch 'master' into gnome3.4
Merge branch 'ics-mr1' of https://android.googlesource.com/platform/hardware/libhardware into aosp
include: hardware: update headers from CAF and ifdef for QCOM_HARDWARE

Change-Id: Icaca0c8f8a91a23f19874e932935b941fc678494
Allow loading of vendor-<class> hardware modules.

If the requested class for a module to be loaded is prefixed with
"vendor-", check that the module class matches the portion after
"vendor-" instead of comparing the full name of the requested class
to the module class. This allows easy use of the libhardware loader
in modules that wrap vendor binaries, which can directly use
hw_get_module to load the vendor binary.

Change-Id: I09f5594589e27c62448ef49ee47225b57dc6a714
Merge "Allow loading of vendor-<class> hardware modules." into ics
hardware/libhardware: Add APIs to support LPA session

Change-Id: I0558cafacb25bfffefdfb1bd2afbf2a90f075a08
hardware/libhardware: Add audio policy functions for FM feature

- Added API for FM volume

Change-Id: I3a6638d9613b0b31cfdbaed8779399bac5c0bb61
[Exynos4] Added Samsung OMX specific macros

Change-Id: I3ca6a3c3f48511a7e0f57a7459db49156efc1859
Merge "[Exynos4] Added Samsung OMX specific macros" into ics
exynos4: added getphys stub for samsung omx plugins

Change-Id: If7a76caee4f8ad6032af980380c9c683bddc9228
libhardware: Add support for Wifi Display
gralloc: gralloc_getphys: fix type of paddr

Change-Id: I1f69e638f5999917e74aa06506ba8dd499cb65bb
Revert "Add interface for waiting for buffer display to be done."

This reverts commit be5b79adaa92163db4436bd4e9163aa105c2972b.

This change is not needed any more because we are caching the MDP pipe
contents when closing the channel. So no need to wait for postFB finish

Change-Id: Iec42988b5197a6f90e8c8c70662290a6d51a84fe
gralloc: gralloc_getphys: fix type of paddr

Change-Id: I1f69e638f5999917e74aa06506ba8dd499cb65bb
Merge branch 'ics' into github/ics

Change-Id: I1b3cb9bc774a0f00e47acbcdc7ad0b21fd46dfd3
Merge remote-tracking branch 'cm/ics' into ics
Additional og configuration settings.
Additional og tokens.
Code changed

testing changes
adding express app, to run: node app
Merge pull request #11 from vikas-srivastava/composer

New : Added composer.json

The general plan for module management in SilverStripe 3.1 is to use Composer to manage the modules, and to rely on Composer meta-data as the primary source of information about a module.
Bug : Removed errors from Composer.json

Contains some minor bugs :

1 - JSON doesn't allow multi line string so making "description" field in single line.
Ensure task type name is case insensitive
create task states
Added /task/create/ with associted controller and action tests
Time filtering of backbone collections
do not generate action files for electric
Failure during setUp would cause test suite to block - now we cleanup (ie we kill running activities) if an exception (eg timeout) takes place during setUp
Basic scaffolding and post associations in place.
Fixed license.
Added a bunch of stuff to gitignore.
Added parameters.ini.dist
Removed files that should be ignored.
Shoot XD
voice file added
All response codes less than 500 is positive
update: finish "insertNode"
Capitalized label in config page.
amrsregistration: creating module repository
amrsregistration: initial commit
amrs registration: initial commit for floating div, add new id, add new name, add new address
amrs registration: added basic patient information
amrsregistration: refactoring class names to contain AmrsRegistration and moved test files into correct package.
amrs registration: modify floating div to add close div and changing the bg color
amrsregistration: adding a temporary hack to test spring binding.
amrs registration: add registration of custom editor
amrsregistration: added deploy-web hack
amrs registration: refactor jsp id naming to include counter
amrsregistration: small fix to set familyName on controller
amrs registration: refactor to add name attribute to the input forms
amrs registration: refactor controller to add handler for "add new" button
amrsregistration: Added minimalist search manager to handle order and validity of person search criteria.
amrs registration: refactor jsp files to pass all the input parameter from the page to dwr
amrs registration: refactor date handling in the js prior to passing the date to dwr service method call
amrs registration: person attribute are now included in the ajax search.
amrs registration: housekeeping commit
amrs registration: housekeeping commit, reverting sourcepath for openmrs jar
amrs registration: added page transition handling when a patient with matching id are found
Added updated libraries and new makefile.
Using Code-first approach to send entity classes. 100% working.
Added SessionComponent to AppController.
attributs calcules
am a3c45533: Merge remote branch \'goog/ics-mr1-plus-aosp\'

* commit 'a3c45533f318d32c42113429947d8bd9a319f414':
  fix previous typo/mistake, submit correct kernel
  Revert "tuna: turn on serial console for non-user builds"
  Update kernel prebuilt
  tuna: Raise lowest auto-brightness LCD backlight level from 10 to 16
  New Prime prebuilt
  Revert "Update melfas touch firmware to vers 0x58/0x38."
  new kernel prebuilt
  tuna: update kernel prebuilt
  tuna: Allow the RIL to control the LTE modem autosuspend mode
  Import revised translations.  DO NOT MERGE
  new kernel prebuilt
  New Prime prebuilt
  Revert "Update melfas touch firmware to vers 0x58/0x38."
merge in ics-release history after reset to master
reset to ics-mr1, but keep history
am 56e8b292: am e6f399a5: audio: decrease headset gain by 14dB for ringtone mode

* commit '56e8b292cb2aa15804eb436d48c71e1a98b36550':
  audio: decrease headset gain by 14dB for ringtone mode
undo reset to ics-mr1 until we have a better method
am 7f46e84f: am f6a4fdd8: tuna: update kernel prebuilt

* commit '7f46e84fad5d751cbe33435efc931daa497eae1d':
  tuna: update kernel prebuilt
merge in ics-release history after reset to master
am bc15fef4: am 46de9f4f: tuna: update kernel prebuilt

* commit 'bc15fef460d966c0115fdd1ccedb72ce930e2987':
  tuna: update kernel prebuilt
am 3e5be04d: am 225ce749: tuna: update kernel prebuilt

* commit '3e5be04d50017348970b60713483d02d556ce40f':
  tuna: update kernel prebuilt
am c1f86d57: am b25db9ef: Merge "Update prime-u with DUN connection type." into ics-mr0

* commit 'c1f86d57c71cee7e2e9086de06031c0d05f2b734':
  Update prime-u with DUN connection type.
am f1e101a5: am b4475e74: require bootloader KJ08

* commit 'f1e101a55471a5a84cebc8123ca1cba5bbb14c7c':
  require bootloader KJ08
am 56043aa6: am a5090c63: Merge "New Prime prebuilt" into ics-mr0

* commit '56043aa6276c45ff624f8866e20ff72cc382b8dd':
  New Prime prebuilt
am 210a5b37: am 481f8714: Reconcile with ics-factoryrom-2-release

* commit '210a5b37d748a9d7d6d9e0d397a55273f14a237c':
  tuna: update kernel prebuilt
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
am 6fcb26db: am b8a768c0: Update kernel prebuilt

* commit '6fcb26db7449505a6f2b47c3377e5740a4c44224':
  Update kernel prebuilt
merge in ics-release history after reset to master
am d1a4d1af: am 1ce41e35: Merge "tuna: interactive governor timer 100ms, min sample 10ms" into ics-mr0

* commit 'd1a4d1af34b94954581e68bcf6cc721f4bc3d81a':
  tuna: interactive governor timer 100ms, min sample 10ms
am c913dc64: am 490e9455: Merge "Limit output bitrate from 1080P video recording to 12Mbps" into ics-mr0

* commit 'c913dc64b730db208ef3517177ff9b94572629cb':
  Limit output bitrate from 1080P video recording to 12Mbps
am ef3e5876: am d9d59081: new kernel prebuilt

* commit 'ef3e5876bdff26d093f34c0c20113a4e3a960c35':
  new kernel prebuilt
Merge remote branch 'goog/ics-mr1' into ics-aah
Merge commit 'android-4.1.1_r4' into jellybean

Conflicts:
	full_tuna.mk
	kernel

Change-Id: Ia97d1e8bf318c00f0b44d200c7d725ad53211170
Revert "tf700t: fix the chipmunks"

This reverts commit d76f880cdc98236934a2549de3a47a2ddc60be47
cm.dependencies: fetch hardware/samsung

Change-Id: I812ad06629ff654437b40c54d91e705236148c0f
bugfix added SimpleClassifier and removed crud from creole.xml
Mise à jour base (matchs privés + commentaires)
- CONNECT > SEARCH FOR PROVIDER > tap on icon leads to Provider’s profile page
renamed sync script
Fixed a dead link
Apply google analytics
Hard coded newVersion instead of dynamic version number
Added DB backup.
Fixes for external storage
global.loadText + checks for the files that doesn't exist
Removing sharing and unneeded libraries.
translates some slang in zh-cn to zh-tw
notes
thesis update
Change README.txt to test, and to make PDF type explicit
fix for artifacts
changing in collissionhandler
adjusting screen on listen space to make waking easier
Changed article technology from 4.0 to 4.5 (this is a test)
Add an XmlFormViewSerializer
New handler to serialize FormView to xml
XmlFormViewSerializer doesn't create the DOMElement anymore
Tests now embed a formView into a representation
Fix test failing on travis
RouteAwarePager is now a real wrapper
New RouteAwareFormViewHandler
Pager links and form links refactoring
Create RouteAwareFormViewFactory
Remove the argument resolver
Easier usage of parameters hash/arrays. Property pathes start with . or [
Fix parametersFactory bug
RouteAwareFormViewFactory is more flexible
Sexier way to handle FormViews action/method
CS
Add some comments
Merge branch 'dev-formview-serialization' into dev
Formatting the output so we can copy the individual arrival times, then just compute the avg for each in excel.
tty: serial: update tegra uart driver
bluetooth: make BT_CTS_WAKEUP available
config: add initial tripndroid jellybean config
tuna: make tuna powerHAL conditionally set max_freq properly

-read value of both scaling_max_freq and screen_off_max_freq from sysfs (previously, power_hal only did the former)
-if scaling_max_freq is larger than screen_off_max_freq, then save it into our scaling_max_freq variable, because it is truly the scaling_max_freq
 otherwise, the scaling_max_freq sysfs path has had screen_off_max_freq written to it, so we don't save it to scaling_max_freq.
-write the appropriate value (screen_off_max if screen is off, etc.) to scaling_max_freq sysfs path

Change-Id: Ifbc6b6063daa063b5f8f5301e2c74880a2920c74
added page reordering
Made language selection optional
Fix CRLF, closes #374
Fix typo
Github -> GitHub (capitalization)
Merge pull request #434 from nomulous/patch-1

Github -> GitHub (capitalization)
Merge pull request #427 from joliss/typo

Fix typo
Merge pull request #376 from robertkowalski/clrf

Fix CRLF, closes #374
Don't display comments link for post excerpts on index page when comments for that post are set to false.
updated to latest version of Sass, fixed deprecation warnings
Fixed “3rd party plugins” wiki page link

Signed-off-by: Brandon Mathis <brandon@imathis.com>
Octopress filters are now limited to html producing templating languages, Fixes #536
Merge pull request #499 from lukekarrys/patch-1

Don't display comments link for post excerpts on index page when comments for that post are set to false
Updated Gemfile
updated plugins to work with latest version of Liquid
Do not strip trailing slash of canonical URLs.

Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Merge pull request #592 from omasanori/fix-rel-canonical

Do not strip trailing slash of canonical URLs.
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.

Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
Merge branch 'master' of git://github.com/imathis/octopress into develop

Conflicts:
	Gemfile.lock
Css and post updates not previously commited
sahana code commit
Merge branch 'master' of https://github.com/altafhussain/Sahana-ODK-Collect-Client
Revert "#240 rename columns 'Parent Subject' and 'Feature' in issues list"

This reverts commit b4c2dcaa4f3565287b6d2d6ab231e828d5ab0041.
Merge branch 'feature/240' into develop
#240 rename feature into grandparent
Merge branch 'feature/240' into develop
Imported source code for VeloxMUD Mobile Authenticator
Adding support to https urls
Explicit add requirement for json gem
Adding option to pass basic auth credentials to fetch data
Updating docs
Changing position of hook
Adding optional global confi gpro changing the status position
Changing the api for status box positioning
Merge pull request #1 from emoreth/master

Added support for accessing Jenkins API over HTTPS, and also HTTP basic authentication
Add Quaddran
Add Flip to Silence Function to CMParts (RingTone and Alarm)
Basic custom implementation of optional param'ed paths using the HTML5 History API.
(2) Добавлен перевод файла migration_lang.php
Fix test failures on Ubuntu
[maven-release-plugin] prepare release jackson-module-scala-2.0.0
[maven-release-plugin] prepare for next development iteration
Updated 2012-12-02-day-one-to-gollum.md (TextMate)
Updated index.html (TextMate)
Updated default.html (TextMate)
Added low chamber content block
advancedquery sorts on Date
fixed package distribution
updated testing buildout configurations; the one for Plone 3.3.x seems to be broken
Remove extra whitespace & new lines
Removed author credits since code hardly resembled original
Added hadoop-2.0.0 to crowbar.yml
Merge remote-tracking branch 'dellcloudedge/release/fred/master' into release/fred/master
Merge pull request #35 from Paul-Webster/pull-req-release-fred-master-4632519d6a

added hadoop-2.0.0 to crowbar.yml [1/1]
Site updated at 2012-11-16 00:44:59 UTC
teste
Merge branch 'master' of https://github.com/felipevolcov/ProjetoMatematicaDiscreta
projeto matematica discreta finalizado
fixing bug in suspendedUserMailOptions
removed title that caused jekyll parser freakout
Adding new post
minor edit
365: first week - added comments, fixed pub dates
kumquat: update power profiles
Give more progress information by default
Merge pull request #25 from Rik/progress-info

Give more progress information by default
initial files added to repo. Hello github!
Updated the lecture on eigen vectors and eigen values.
Fixed two typos in the variation of parameters.
Merge pull request #23 from KellyBlack/black_dev

Black dev updated the slides for eigen vectors and eigenvalues.
added Pods UI fields
Updated to patch insecure functions
Supress error at require
Update global.php
Update index.php
Merge pull request #1 from xenLiam/master

Security fixed
We don't need all this code, plus it breaks the build without framework/settings changes
echo wave seems to be working
working on assignment 3
Merge branch 'master' of github.com:inge91/Netwerken-en-systeembeveiliging

Conflicts:
	Assignment8/lab8-skeleton.py
Removing first proposal.

It's part of the history. It isn't useful anymore. It served it's
purpose: providing some text to the second rev, and inspiring new text.

Goodbye, first proposal. We hardly knew ye.
Title and explanatory footer (closes #8)
Update rom-extract-files.sh

dont use setup-makefiles.sh
added feature projects
added update site
added pom to update site project
Add gist for fixing flicker on internal display with Nvidia Quadro 2000M.
Add a warning about the number of updates required with an empty database
Article on using FruitJuice.
Initial add of Sublime Stata package.
added sublime-less2css
Added Color Scheme - carlcalderon
Update repositories.json
Added Element Finder
Adding syntax matcher package
Add Clientside plugin
Adding JSLint
Added Sublime-Finder
Adds Ensime package
Add hookblime
Added rmate
Update repositories.json

Added a redo of the default solarized theme that remains more true to the 
original scheme as developed by Ethan Schoonover
See https://github.com/mybuddymichael/solarized-sublimetext2
New maintainer for Rust package
added snake_case
Fix hookblime entries issues
Replace spaces w tabs
Including official TextMate solarized theme

This variant of Solarized attempts to be more in-line with the original
colorings as well, but is much more comprehensive than the one from
the previous commit.
Added ludik plugin: templates and navigation in Eludia.pm framework
Update repositories.json
JS Pagination for all
Content inserted into a basic but functional layout
Updated browse and added images for browsing
PHP コードの開始タグを修正
remove  implemented
ログに正しく時間表示
bundler, guard and spork
Update john-of-ephesus-eac.xml
wrapped bootstrap
version for mysql
Input parameters for actions
version 1.53 - added 12w37a blcoks: all stair angles, cobblestone walls, mossy cobblestone walls, heads, all stairs in all new orientations, item frames, flower pot, beacon, trapdoor placement, dragon egg, command block.
version 1.54 - added 12w41a blocks: 3 diff anvils' or diff quality/orientation.
Merge pull request #20 from overviewer/exmaple-snapshots

1.4 has been released. merge snapshot into master.
deleted:    boot-u8860.rle
	deleted:    device_u8860.mk
	deleted:    documentation/charger-mode.txt
	deleted:    documentation/dmesg-recovery.log
	deleted:    documentation/fastboot.txt
	deleted:    documentation/fdisk.txt
	deleted:    documentation/init-flow.txt
	deleted:    documentation/logcat-enable-kernel-logging.txt
	deleted:    documentation/ls-lR-system-U8860IV100R001WEC00B924SP01.txt
	deleted:    documentation/ls-lR-system-cambodia-demo.txt
	deleted:    documentation/partitions-sizes.txt
	deleted:    documentation/testing.txt
	deleted:    full_u8860.mk
rails project with skipped activerecord
Modeller Plugins Updates
dont open a new tab on each save #18
now the preview in sublime is a scratch file
Merge pull request #51 from aponxi/master

Markdown Preview in Sublime is now a scratch view
Improve go-links
Add boost pulse to Interactive governor and modify to work with our
old as kernel.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Revert "S5PC11X: PM: Add workaround for Audio HW floating bug"

This reverts commit bdd9b61c32e0a3b7cf74bdb62a9f2fc7e7b5fc37.
KVM: unmap pages from the iommu when slots are removed
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
bcmdhd: Various changes from samsung source.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Couple net changes from google source
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Revert "Add boost pulse to Interactive governor and modify to work with our"

This reverts commit 7d8453270eb98babf480329b0f8038c14b1e7555.
Site updated at 2012-06-10 12:28:30 UTC
Ready for post
Almost final for today 5, hopefully
[FEATURE] Updated demo to demonstrate delegate.
Changed some module names around
BootStrap class configured with default Status codes
Add CefBrowserProcessHandler::OnBeforeChildProcessLaunch and CefCommandLine::PrependWrapper to support custom construction of the command line for child processes (issue #628).

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk@810 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
Fix DCHECK failure when calling OnSetFocus from LoadRequest (issue #685).

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk@776 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
Actually assign the variable
Site updated at 2012-05-09 07:11:52 UTC
add Moonlight
Add bootmenu 1.1.9 cpcap flag and remove unused progress images

cpcap flag is used to get battery level, nice to know before doing
recovery backups or installs

Change-Id: Id5f55f6be2a7f2eea46cd1952160d11df1d2c2e1
Merge branch 'cyanogen' into gingerbread
Merge branch 'cmdefy' into gingerbread
Update CHANGELOG for a pull request from NARKOZ
modified:   bdsitemap.txt
Credits:add() now pulls the mandatory fields when gathering User data..
New naming convention. (whew)
Merge pull request #2 from jdiez17/master

ABI (for real).
Fixed type identifier.
re #57 created a base class for simple chooser dialogs and used it for
ChooseFileDownload.
re #57 added a sort field for ChooseFileDownload
re #56 Edit User dialog now makes use of a small data grid and a
chooser dialog for adding and removing groups.

Had to rename GroupProxy to LegacyGroupProxy so it can be replaced at
a later time. That will likely involve coordination with backend
development. Made issue #58 to get this done.
re #88 Vast majority of "Organization Administrator" role is
implemented. A few things won't work properly until we get backend
updates to the role.
re #55 can now view and edit the passing score on an exam.
deadline-iosched: disable merging of requests
218.88MHz derp
Merge pull request #4 from BBC-Knowlearn/refiner

Refiner
started adding places
end to end now working
merrrge
Increment version to 0.6.0 (2)
Fixed House class and light source

Moved the main light source to a more fitting location and edited the
House class some.
Add intergration_sign_in helper method
Done with user edit/update, index and destroy actions
Seems kirjoitusalusta has changed the dump urls or something, because
this commit is AFU

Revert "dumped with script"

This reverts commit 22695e8c889307971da2126c0562e3033de4fab5.
Made some minor changes to FOXML.inc

Foxml.inc assumed that you always passed in a transform and a document,
in some cases I wanted to be able to use FOXML.inc without a
document or tranform, so I added checks, now if they are NULL
they will not be included.
Merge pull request #26 from jonathangreen/6.x

Made some minor changes to FOXML.inc
Typo...
Typo...
Merge branch 'release/0.2.7.1'
Fixed issue when in the list of WHMCS product / services for current server other server product / services were displayed, added info boxes
added CoverFlowWidget project
Cleaning up for clean pull request.

Revert "Adds support for the CM19 USB X10 adapter."

This reverts commit b606eacb13298a631b9b666463897669d6039a61.
Remove Battery LED Customization
Extend ICS_AUDIO_BLOB back-compat to the 4.2 API

Change-Id: Id58a2eb715c86f6c022e0ef625ce498661d7d29c
exynos4: gralloc: add camera and nonecache usage

Change-Id: I53a7dfc8355a05aeae007e7d61c4d95cce125bfd
Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9
libhardware-qcom: disable a set of qcom api that don't exist
VideoModule: check for videosnapshot support in onSingleTapUp

onSingleTapUp is now triggered through PreviewGestures instead of
ActivityBase, so the check in initializeVideoSnapshot() is no
longer enough to prevent triggering video snapshot on unsupported
devices.

Change-Id: Iab0b4b3d0cd9b0ea7278eceee3ae58419f5df100
Camera: Prevent double-stops on preview for some HALs

The OMAP3 HAL (at least) stops the preview while taking a snapshot,
without generating events to the upper layers, and telling it to
stop again leads to an inconsistent state.
Use "previewStopsDuringSnapshot" to avoid sending a stop while
it is already stopped

Change-Id: I4d4fe501c0dd6dd9aefb7d35f0e9dc6887e15162
Camera : Powerkey shutter (2/2)

    Allows user to take use power key to take pictures/videos

    Patchset 2 : Minor cleanup
    Patchset 3 : Keep string case inline with others

    Change-Id: I4dba67792d64f747174f5346a0a2a75ab632bb48

    Conflicts:

    	AndroidManifest.xml
    	src/com/android/camera/ActivityBase.java
    	src/com/android/camera/Camera.java
    	src/com/android/camera/VideoCamera.java

commit 3d8dca72ded986b51a202f24407593fff8fa52b2
Author: Danesh Mondegarian <daneshm90@gmail.com>
Date:   Sat Oct 27 23:10:07 2012 -0400

    Camera : PowerShutter fixes

    Ignore keyevents in video camera as well when in thumbnail mode
    Remove unecessary /repetitive flag modifications

    Change-Id: Ic0fe782387d2f331b80c68ab8067d8e2020c03ca

Camera : Ignore keyevents when in gallery

When in gallery view, ignore any keyevents.

http://goo.gl/9FEGw

Change-Id: I6d412327d603f204435302c1955b4dcd3bc942fc

Camera : Fix Ignore keyevents

Call super's onKeyUp/onKeyDown instead.

Change-Id: I054a58f1d0758edafdd4505d41401f3f8f53dda0

Change-Id: I7f14bfbba22b25322bf664e9901991ae26555674
camera: add support for samsung and htc camcorder modes

Change-Id: I68e6995a51dffa3b5851eb4b7a3a72e60d201d5b
camera: allow setting video-size before recording starts

Needed for some samsung cameras.

Change-Id: Ib87071bdd900aa1a42253bf6e2038b0af51f065b
Camera: Allow a device to request the focus modes at build time

By default, if a HAL supports touch-to-focus, mode selection is
disabled. Make that an option for devices where manual modes
work better without TTF (Macro, for instance)

Change-Id: Id47fba2a9d156b157440485a0fa516871076d9f9
Camera: Dutch translations

Change-Id: Icafae911c0d12493097d31ebc3ffd770fb15a256
camera: Add debug logging when setting parameters

Change-Id: Ida35e08e02f51b7ca2b89dfeeb7e550e6e562c25

Conflicts:
	src/com/android/camera/VideoModule.java
camera: Add ZSL support for Samsung/Qualcomm cameras

 * Preview management for Samsung/Qualcomm cameras
 * Add workaround for broken face detection on front camera

Change-Id: Ib36bd21c9a76b45bced3eee2f25acc35b5d82b30
Camera: port additional settings from jellybean 4.1

- add burst mode
- add color effects for photo and video
- add ISO settings
- add JPEG quality settings

Change-Id: I0d6a3cf864e618e3698baa42f8a11c0fa9a908a7
still attempting to get wifi fixed, but I need a vacation
#_23 Ameise:
Refactoring
Add guest categories link to README.md
Renamed defconfig to pyramid_defconfig