labofsahil/github-event-dataset-2012 huggingface dataset:
Added bash script to convert *.js file to *.cs file.
Improved *.js to *.cs file converter so that it can run all steps at
once if no step index is provided on the command line.
Merge branch 'ld25' of github.com:westindiecollective/unity3d_projects into ld25
chef tips and fcitx
Bugfix in inventory result display.
Added detailed show format notes
Updated source/developers/documentation/scripting-apis/client-scripting-overview/scripting-with-javascript/introduction/using-borwser-objects.html.markdown
Updated source/developers/documentation/ac-mobile-build-phonegap/certificates/manual/android-certificates/google-play.html.markdown
framework
Merge remote branch 'upstream/master'

Conflicts:
	src/DependencyPaser.cpp
Change the name.
Minor fixes.
Minor fixes.
Final for today
Merge branch 'ics' of github.com:ColdFusionX/android_device_zte_common into ics
Update notes for submitted changes

* tf201 : rename nvram_nh615.txt to nvram_4329.txt
Update notes for submitted changes

* haida: media profiles cleanup
Update notes for submitted changes

* DASH backport: config change
put the map header on author pages that have map posts
Add custom errors
Check for bad parameters to #paginated_resource

The page and per_page parameters are going to be strings (coming from
query parameters in URLs) and they need to be converted to integers.
Look out for values that can't be and throw the appropriate error.
beta_0.1.3
Fix the horribly broken menus...
update EventInterpreter
change to reports via DP
Merge branch 'master' of https://github.com/MobileDigitalImaging/mobmed_order_dev
Fix license headers
[maven-release-plugin] prepare release ness-jackson-1.1.0
provisioning 화면 디자인 적용
left out a silly space
Closes #1: ZC fix
missed the final closing argument
implement fire() in timerAid
change in the main attribute watcher to run asynchronously
add replaceObjStrings()
Added longpoll test
Updated json long poll manager and tests
Created json dispatcher interface
Changes to Defconfig from Samsung Sources
added a new comments
'removed unnecessary spaces in code'
Remove excess GPS configuration from makefile
added data.wsf to gitignore
made it possible to add panels and content, only send stuff if it is a reqquest as well, next we have to work on the forward button and what to do
update manifest
Merge pull request #3 from Yitsushi/master
added more tweaks
added FileManager to build
updated prebuild kernel
fixed vold.fstab device for usb host
Hope i didn't break something
Added static helpers for determining a property's name.
Step through lower, title, and upper case when using inc/dec_min
Finalisation ...
Finalisation partie 2 ...
OCD: organize RIL props
Add components required for low-power mode
rm chrodriver.log
update gem rspec
Added new rad dll
Added bin zip
Added nuget package restore
Fixed assembly name error
Added functionality to open all links in a new window/tab
Added resized images for the about page, made the content area for the about page a little wider, and added two nicer marker images
Defined field handler for the 'About the city' field.
Fixed comments.
Added a new field handler for images; it's also defined for the photo field.
server sends an additional message with any notifications when user logs
on.
oppdatert GetUserHandler
Merge branch 'master' of ssh+git://git@github.com/bartvbl/Fellesprosjekt-2012-gruppe-32.git
Fixed overriding invoke for BB10; Removed BB10 tag for BrowserArguments
add color to rspec
add simple navigation component
add simple navigation helper
autoload navigation component
autoload navigation helper
adding navigation support macro
add specs to navigation
Merge branch 'master' of github.com:mecathcart/Drag-and-Drop-FieldLinguistics
Merge branch 'master' of github.com:iLanguage/iField
Merge branch 'master' of github.com:iLanguage/iField
Tried to add modalview to appview, but it doesn't work correctly
Merge branch 'master' of github.com:iLanguage/iField
making sure file is removed
Merge branch 'master' of github.com:iLanguage/iField
Pulling from upstream
Merge branch 'master' of github.com:iLanguage/iField
Backgrounds now change in a fixed order #167.
working on binding push and pop on the corpuses array which is in user, so that the corpusesview can render updated models. for refernces see http://net.tutsplus.com/tutorials/javascript-ajax/getting-cozy-with-underscore-js/ for #178
Merge branch 'master' of github.com:iLanguage/iField
HForm :
{$form->input('name')->htmlLabel('{icon userName} Name:')}
ajax partial load
CImages : update the model if image already exists (a pk is defined)
Initial blank template.
Added slider Library: https://github.com/egorkhmelev/jslider
Added local jquery
Demo with html chart and slider.
css:apply-stylesheet: support for @page etc.
bundled binary: use component name for better logging
Modified README to mention that the project also uses deletes to find suggested words
modificacion de pantallas
Make it more apparent that patch center values are being edited.
Update the patches when the focus leaves any of them.
digispark release versions
Initial commit
Setting up to canonicalize EOL in the repo (.gitattributes) and ignore various kinds of files (.gitignore)
Created admin directory for scripts and other files associated with maintenance of the respository. Deleting CVSROOT since we don't need it anymore.
Pulled in README.md
5th Update
5th update
UML diagram documentation generation with ydoc: document how to use it and automate how to apply it
(cherry picked from commit 8ba9f739b180ae0a85b6d99bc868acfa0b5823c5)
Debug Not showing O.o
Done for today, nothing fixed in here...
fixed knockout.js code example err; added applyBindings to make it workable example; add view another binding to show imidiate changes
footer fixes for ipad landscape and adjustment on bio page education sidebar for spacing
HTML5 <head> tags added to header.tpl and maintenance.tpl
Added an option to show current user name in the Account Switcher
Merge pull request #110 from Lugghawk/master

[feature request] Display *all* usernames in popdown, and don't remove the current username

I'm pulling this in, but I'l be adding highlighting to it too so you can see the current user you're logged in as...
querying correct pod
edited photo wrapping div size to accomodate phone numbers
Working on gameover
Merge branch 'master' of https://github.com/indivisible-irl/BaconGameJam02Starter
fixed bug in merging conditions
missing includes
WIP: xylonfb 3.3 android
Rearrange project hierarchy to make it easier to find the only files necessary to import.
detailed SPI timing diagrams, spi read working

Created detailed SPI timing diagrams for the documentation.
This also helps a lot with programming the SPI (spi_ctl.v).

Starting over with spi_ctl.v
Got reads working and verified in the simulator.
Removed password authentication through Drupal so that passwords in m360 don't have to match Drupal
fix for JenkinsTestSuite
JBIDE-13055 Fixed failing ConsoleConfiguration UI test
Fix opening of Preferences Dialog.

Test is properly waiting until Preferences dialog appears
gitignore added for test project to contain empty folders
fix for cdi JenkinsTestSuite
Set tycho parameters for all integration tests.
surefire.timeout=7200 (2 hours)
XX:MaxPermSize=512m
Fix waiting for dialogs to close
Merge branch 'master' of git://github.com/jbosstools/jbosstools-integration-tests into JBIDE-13055
to remove breadcrumbs from covers
New Ajax loader.gif
Changement de methode de zoom
Param GIT
PARAM GIT
cpufreq.c: decrease frequency transition latency f
rom 100 * 1000 to 30 * 1000

commit 882e691a4f687eefa39ed9d866419454289d4f03 1 parent 35f34184b3
Port forgotten things to gsettings
Merge pull request #3 from NiceandGently/master

port to gsettings by Wolfgang
first commit -> documentation on http://www.mesta-automation.com/multilanguage-applications-with-c-with-database-support/

Signed-off-by: Michele Cattafesta <michelecatta@gmail.com>
Add product and vendor to model show
Display schema in view
Fix filename for selleck template
Make orders side smaller
Putlocker fix (ghizzu)
added basic page styles
added sample image
Merge branch 'master' of https://github.com/nanovazquez/listview-layout-generator
Remove --quiet arg to get logs with useful content
README: Add "How this works" section

The "how this works" section should explain how this set of
scripts builds the toolchain and why.
modified quick start for folsom
Fix list filter management after filtering or reseting filters in the list
Extends the reserved action to collection management link
Adding edit management in dialog like create for selected association
Truncate problem on multi-byte strings
Set up to test with Singly
Remove existing DataSource code

The datasource wasn't CakePHP compliant (at all) so this rewrite needs to start
by removing the old code. This commit also adds the Media model as a means to
start implementing the Datasource properly.
Add retrieving of Media items
Add handling of Instagram pagination for Media

It's not possible to get more entries from the API by providing a "limit"
parameter or something, so I have to paginate and combine the results to return
a list of the desired size.
Add correct handling of misconfigured datasource

If the "instagram" datasource isn't configured properly then the authentication
may fail, in which case it should return false indicating this (it was
returning null).
Rewrite InstagramSource test
Merge branch 'rewrite'
system: Update kernel/wifi/misc

overlay: enable p2p
wifi: remove bcmdhd.ko (it's in-built for wifi direct)

Changes:
mmc: sdhci: Skip rest of suspend if mmc_suspend_host() fails
mmc: sdhci: Allow mmc_suspend_host/mmc_resume_host for sdio devices
defconfig: ics: unset BCMDHD_BCM4330B1_FW, use fw_bcmdhd.bin and
                build-in bcmdhd
defconfig: ics: switch back to OVERLAY
arm: tegra (partial): fix numerous warnings
media: fix corner case in tegra_mediaserver
media: video: avp-ics: backport/sync with nvidia's 3.1
net: wireless: bcmdhd: Allow Improved suspend/resume processing on 2.6.36
Bluetooth: bnep: Fix bad ether addresses
wireless: bcmdhd: move wlan_gpio to MACH_SAMSUNG_VARIATION_TEGRA
wireless: bcmdhd: import RDWR_MACADDR and dhd_custom_sec from bcm4330
drivers: wireless: bcmdhd: clear pending interrupts before irq release
net: wireless: bcmdhd: Allow Improved suspend/resume processing on 2.6.39
net: wireless: bcmdhd: Always turn Off wlan power on interface down
net: wireless: bcmdhd: Add SETSUSPENDMODE command
net: wireless: bcmdhd: Minor cleaning
net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option
net: wireless: bcmdhd: Update to Version 5.90.195.30
net: wireless: bcmdhd: Update to Version 5.90.195.28

reference:
 video: nv-tegra.nvidia.com/linux-2.6.git (rel-14r7)
 media: nv-tegra.nvidia.com/linux-2.6.git (android-tegra-nv-3.1)
 wireless: bcmdhd: github.com/solarnz, github.com/kcrudup, nv-tegra (rel-14r7)
 bluetooth: github.com/cyanogenmod/lge-kernel-star, github.com/kalltkaffe
 mmc: github.com/solarnz

Change-Id: I3266c16bea833bb7e5ab9df863749b6998dc1727
modifiche edit corso
modifiche parte edit, tab search
modifiche parti di edit + start inserisci foto
modifiche pagina edit
finish checkbox risposte / start checkbox newsletter
finish newsletter check
Merge remote-tracking branch 'origin/elena' into manuela

Conflicts:
	doing/compass_app_log.txt
	doing/css/screen.css
	doing/sass/screen.scss
ingore
Merge remote-tracking branch 'origin/manuela'
Fixed a problem with saving prices when they contain a thousands separator
Style tile post, updates to link hover color, images for style tile post.
add "dotgovonly" jquery validation method, closes gh-14
Fixed CSS Issues and no form is loaded when cookie is set.
Adjusting speed of plasma animation
tests are now using reddeer swt layer, hsqldb jar removed
merged rocon_gateway_sync into rocon_gateway, just file copies and import fixes, #59
Update statusServer.cpp
don't skip primary keys
allow the user to hint that a table is not a many-to-many mapping table
allows for datacenter to be overloaded
updating cassandra utility
Added unit tests, and authentication
Architecture major and main page updates from Judy
CASNR major text updates from Judy
CoJMC major and main page updates from Judy
CBA major text updates from Judy
removed unused code for calling managed objects fetchByPrimaryKey method which were not implimenting
5 pixel offset fix

yet again..
updated normalize to reset all vertical spacing to 0, created corresponding vertical rhythm less sheet and tester background png. removed extraneous images (I think from the project that this is forked form) and cleaned up a few missing tags in index/header.
changes to healthdata
triple tap
Consider FAILED a final state
Updated format to work with Moodle 2.4
Favicon Support in header.php with directory URL to theme folder
A little less double jump
typo (no archive_id when deleting)
General code betterment.
Attach the postboot script
Added TimePeriod
Added TaskTypeClass
Fixed namespace typo
Added TaskType
Created Task
Renamed WorkerController -> BaseController
Added improved controller instantiation in base test case, now called event listeners
Add getXState() methods to WorkerService
Added VerifyControllerTest
Cleaned up VerifyControllerTest
Fixed variable name typo
Added Task types and type classes
Moved test preparation to setUp()
Added TaskTypeService
Ensure task type name is case insensitive
create task states
Added /task/create/ with associted controller and action tests
gotta have this for Hadoop
hacks to link R shared libraries
moved WordNet here - makes other stuff simpler
do the installs non-quiet so user knows something is happening
Added button settings.  Added setting for killing of apps by long pressing back button
Modified handling of instance method definition to use module support if instance is passed (instead of throwing error).
update AssetManager and load assetic via a submodule

Cheating to load assetic via a submodule by wrapping it with a Module.php for now instead of using composer. Will update to use composer later.
schema, tab & things oh my
slide panel update
further attempts to clean up positions
Remove heap size translations

This breaks CMParts if a device has overlayed different heap sizes.
As they really aren't translated, just remove them and have the
defaults/overlayed values take over.

Change-Id: Idd9d28dae72c0978ffdbe1d5cef75854bd939c93
Merge "Add option to enable/disable the ICS rotation animation" into gingerbread
Merge remote branch 'upstream/gingerbread' into gingerbread
nozomi: remove common stuff

Change-Id: I4d0b79420b9f6a49c4a7c3001e26acd9aa9c4758
New Branch
Leestellen
Merge branch 'master' into Boris
Merge remote-tracking branch 'origin/master' into Boris
Leezeichen wieder entfernt
konflikt
Aufgabenstellung aus den Subsections gezogen
Merge branch 'Boris'

Conflicts:
	PR Regelungsrechnik - Versuch 1a/PR Regelungsrechnik - Versuch 1a.pdf
	PR Regelungsrechnik - Versuch 1a/PR Regelungsrechnik - Versuch 1a.tex
Antwort auf Frage 1.6.3 sowie 1.7
Merge branch 'Boris'

Conflicts:
	PR Regelungsrechnik - Versuch 1a/PR Regelungsrechnik - Versuch 1a.pdf
nix
Merge branch 'Dirk'

Conflicts:
	PR Regelungsrechnik - Versuch 1a/PR Regelungsrechnik - Versuch 1a.pdf
.gitignore wird mit synchronisiert
output.pdf wird nicht synchronisiert
noch mehr auffgeräumt
.
.
Scilab erweitert
Merge branch 'Dirk'
M_L
new
Typo on configuration dialog

DataPort was missing a space.
Changes to versioning

Versioning now inline with other Labs plugins.
Version included on configuration dialog.
Version included in installer UI.
Up bo admin routes
Up project : Reputation customer done
libhwcomposer: Mark all layers below the SKIP layer for GPU composition.

If there is a SKIP layer present, the SKIP layers are first composited
using the GPU. If there any layer below the SKIP layer that performs
any operations on the FrameBuffer, it results in undesireable results
on the screen e.g. artifacts, since SurfaceFlinger draws the SKIP layers
before the HWComposer.

Change-Id: I198236673e2a0bd19a6087ff01049061547abb47
CRs-fixed: 327392
Browser: Use ICS alert icon

Change-Id: I9e9b44fc1009191db8b84a7cdb87a94905b9d786
Multimedia feature port from ICS

Support for runtime media preload configuration with 3 options:
    - Never
    - Only on WiFi (default)
    - Always

Support video transition animation

Change-Id: Idd03f5bb57d6f78ec8b8e407eba01904f392f554
Runtime enablement of WebGL

Add Labs setting for enabling and disabling WebGL. Need to make sure
WebGL has been compiled in before showing runtime enablement settings in
Labs menu. Requesting information from the native side through JNI.

Change-Id: I50e9321babaaf039e25e30f7ead6527169d32e1b
Adding exception handler for voice recognition activity

CRs-Fixed: 395193

Change-Id: Icedba4ef192d56dfcc9918b2f8afe96b2c662fb9
Eliminated spaces from brand
Scoring Glitch fixed!

Now you only get a score if you earn it ;)
[maven-release-plugin] prepare release xmlwrapper-2.1.0
refactored link import and synchronization
dont package stats as its in settings now

Change-Id: If99f9fe0ab2e2d3f2ef6ad29b8320249d020bb09
update binaries for IAR.
Hooking up bill data.
Hacking around unknown issue where against tracking was not accurate.
Brains and Maps loading from file

Brains and Maps load data from file now. Maps load only raw char data
from the map file, Cell object construction from this data not yet
implemented.
Map tournament-legality verification still pending.
Simulation running and returning expected state information.

Maps and Brains loading from file, simulation can be run and results are
as expected from user-provided example state dump.
appropriate zeroing out to allow bit perfect comparisons
got rid of outdated reference in makefile
Simplifying BigQ

use size of pages directly rather than creating a temp page and filling it, and then throwing it away
record has accessor for size of record.
const stuff in comparison engine
lots of commented out print statements removed
join optimizations attempted
tweak scroller variable names

Change-Id: I8709abfe8984ca879102dbf9217ff46ed024c9c7
toisen asteen epayhtalo esimfiksailu
Merge branch 'master' of https://github.com/Oppikirjamaraton/oppikirjamaraton-maa2
Update index.html

Adds google verification tokens.
ajout de la methode
Make cucumber tests pass
Merge pull request #2 from tmock12/add_tests

Make cucumber tests pass
AddItemHealthPercent
Network::ToggleDequeue
egl: Reintroduce eglGetRenderBufferANDROID

eglGetRenderBufferANDROID was removed as it had no users. This commit
reintroduces this extensions as it's used by Qualcomm graphics HAL.

Change-Id: I493306830a0d4f8722a42bcc84fb49236afdabeb
Merge "egl: Reintroduce eglGetRenderBufferANDROID"
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/native into jb-aosp
manueel tracken werkt nu toch wel echt bijna
location alias matching functionality
Added some more css
Merge branch 'master' of github.com:SpencerForell/Study-Participant-Portal into origin_master
Added enhancements to UI and fixed the answer selection bug
Merge branch 'master' of github.com:SpencerForell/Study-Participant-Portal into origin_master
some corrections
Merge branch 'sources'
update site
another approach to the same problem
use standard synopsis utility
Merge branch 'master' of github.com:WardCunningham/Smallest-Federated-Wiki
proper redirect
ARQ-1076 prepare release 1.0.0.Beta1
ARQ-1076 prepare for next development iteration
Tracking via cloudflare
Extracted SmartStore functionality into its own library project (work in progress)
SmartStore needs to declare all plugins since it comes after the SDK
Merge pull request #106 from wmathurin/smartstorelib

Extracted SmartStore functionality into its own library project
Moving SmartStore lib to hybrid/ and moving test projects under test/ and moving RestExplorer to SampleApps
Merge pull request #107 from wmathurin/smartstorelib

Moving SmartStore lib to hybrid/ and moving test projects under test/ an...
Merge branch 'unstable' into versioning
fixed space issue with my else brackets.
Deleted _posts/2012-10-08-random.md
Add the testing data
Update class-jigoshop-dependencies.php
applied fix adb root

When adb is enabled, only connect the gadget when adbd is ready. If adbd
dies or is restarted (e.g. "adb root"), the gadget is disconnected when
the adb device is close, and it is re-connected once adb re-open the
device.

- Add callbacks to adb, similar to FunctionFs callbacks, to notify the
  gadget when the daemon is ready or closed.
- Refcount calls to android_enable/android_disable to enable the gadget
  only once all the function daemons are ready.
- Add enable/disble to android_usb_function to notify the function when
  it is added/removed from the list of enabled functions.

Signed-off-by: Benoit Goby <benoit@android.com>
Change related to FileTransfer, need to get a test going for this somehow
Refactor out the Java casting code

When we return JSON to the Java side it does not have the proper methods such as Contact.save() so we need to cast the JSON to the correct JS object. This used to be done from the Java layer calling the right method to cast the JSON. In this new approach the JavaScript layer will no what needs to be cast and call it's own internal function to do the cast.
Adding custom headers to upload
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Adding unsupported action plugin result return if invalid action string is specified to accel and compass listener plugins
woops java type checks! love it!
changing JS invoked from native to work with modular js
Changed JavaScript invoked from PluginResult native code to use new modular JS approach
Unifying File API error code/response style
removing unnecessary try/catch
Return string for root location in requestFileSystem
Prefix URIs for file API with file:/// and persistent storage should never point to SD card
Need to add/trim file:// where applicable
truncating file:// protocol where applicable in metadata func
remove file:// protocol from various fileutils remove methods
remove file:// protocol from various fileutils  methods
remove trailing slash
Use strings not objects
trim file:// URI from uri->path conversion method
more file:// URI truncation :D
add i18n domain information
Fix readme.txt so WP.org can properly parse links.
Pin BuddyPress Docs 1.2.8
Pin GES 3.3.1
Updated the Apache Hadoop User Guide.
added target_ages to readTarget, added DIHonly script
Revert "Externalize symbol picker options to resources"

This reverts commit c218e2c7c9c5c8cc663e8ff18aaeafc251cc082e.

Change-Id: I3017a5ce803f1bb8e52abf2ee33df6354b729e2f
Merge remote-tracking branch 'upstream/gingerbread' into gingerbread
Bootstrap app model, and misc formatting. Updated to backbone.layoutmanager v0.6.5 and other libs.
add a 'container' option to Meio.Element.List
use the container for positionning
Merge pull request #8 from PathMotion/list-render-in-container

add a 'container' option to Meio.Element.List
Update _posts/staff/0002-9-27-laura.md
Updated Intro Overlay

• Start button
• Next/prev navigation buttons
• Dot/steps navigation (Anchors)
• Text fields & labels
Added the CNAME for custom domain
not client profile! ruddy client profile!
Updated instructions

- Added suggestion for Windows users
- Added further details to existing instructions
Corrected typos
Edited comments
Corrected typos
Edited comments
Edited comments
Added pip install
Resolved issue #6

Added share on G+ and Twitter
Small typo in README.md (postgres)
Merge pull request #112 from jarlarntzen/patch-2

Small typo in README.md (postgres)
Fixing lame social message
Decoupling from django-mailer
#108 Using the old URL for paypal
#108 Fixing payments
Fixing 'payment canceled' page
Bugfix: random breakages because of user's invalid email address
Update README
Update README
Import virtualenv-bootstrap
Specify package's versions
adding an example, fixing up the readme and adding a text-shadow function to more easily support multiple shadows. Also, adding the gemspec.
net: wireless: AOSP revert cleanup
Uusia tehtäviä: books->string, duplicates?
Merge branch 'master' of github.com:iloveponies/120-hour-epic-sax-marathon
mione_plus: remove fm stuff

Change-Id: Ia5e85376c5333c585f85621fdb0c05e0e1c9a579
Adding some CSS tweaks
- Estructura general de la web. Plantillas y contenido.
first draft of revamp
made initial changes to forked project
Merge branch 'feature/revamp' into develop
fixed video-stop bug
updated read me
Merge branch 'release/1.0'
Added haskell solver
Update previous entry
Added check to make sure postcompile worked
9:49pm
Billigere markedskort
Ny regel: Lettere å treffe folk i sverm med bue
Oppdaterte kampseid + 3 nye.
Noe errata og et par nye rom.
Simplification des règle afin de gagné en performance
maj virt
added thumbnail rotation
stabilise viewport totals bars height
add data for br,fr and in
add links to other countries
add australian data
add link to australian data
Удаление системных файлов
复制 mindpin 客户端
merge
bugfix:fix the problem that open 2 identical tabs when using Google Reader
Added do not use msg :D
note
robots

edited html + css
Use Stanbol to detect the language
Missing class from last commit
More public accessors to make it simpler to design UIs
Make it easier to customize the event listener
leverage declarative event name filtering
Actually last change does not seem to work as expected
Reworked the whole metadata thing to get issue 26 finally solved.
Update Gettext

Signed-off-by: Dmitry Dudin <dima.dudin@gmail.com>
Update version

Signed-off-by: Dmitry Dudin <dima.dudin@gmail.com>
tossing category association into the mix
READMET Update
Updated README
Fazit geschrieben
Merge remote-tracking branch 'origin/master'

Conflicts:
	hauptteil/fazit.tex
Unterschriftenfelder eingefügt
Fixing view if no menu is found
Fix typo
Merge pull request #1 from defkode/patch-1

Fix typo in script - thanks defkode.
Merge remote-tracking branch 'rtomac'
Updated package to version 2.0.
Fix background-color for pre/code
add a static pages controller
add integration test for static pages
fixes
Add USB notification
cleanup + fix hdmi audio
Fix percentage battery in tablet mode

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
Fix percentage battery in tablet mode

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
fix bug of rvalue reference issues
Some stuff for many-to-one transactions - unstable API so far!

It's a bit like master and slave but with some other features and a
change in protocol.
整形
change package name
Add command for fetch ImageViewURLReplace.dat
Merge branch 'master' of github.com:superbrothers/node-imageviewurlreplace
add ignore file
Added separate _parseJSONTag function that logs JSON parse errors. Small cleanups.
new example of urls with special mobile behaviours like email, tel or sms
Site updated at 2012-08-09 18:35:04 UTC
netd: restore IPv6 quotas

Change-Id: I2347dd360980aa811e098abd7fa2a3b5850fbbb0
Two more modules ipv6 netfilter modules required

Change-Id: I5a782a20b8ec1ba44ff160525c515ae4b1b3e9e0
added CNAME file with custom domain valeriofarias.com
fix the fling direction detection

Change-Id: Iba275a4e4d9437bcd62d14899fd48f8453d3f80d
optimize app drawer scrolling

Change-Id: I73ba22c3945a69ad0fde62b8124b89fd1266ab6a
optimize childDraw, disable catalogue switch transformation, small draw adjustment

Change-Id: I7872d1bb042c291d9da4c43dc81d9d94a968b6e8
Added infinite loop

Change-Id: Ic3d4f5bbfed3037a8e93dd4a213d422636438974
Set more precise TSR on wikitext list items

Provide a more precise tsr by dividing up the tsr ranges of listItem tokens
into the individual generated HTML tokens.

This fixes one selser test, and moves some more selser tests closer to a fix
by fixing the bullet serialization. Otherwise, no changes to parser tests.

Change-Id: I0df22319f008387800968f996028a17e1048ea16
Merge "Set more precise TSR on wikitext list items"
Refinement to 42d265a to strip non-nl WS around "|".

* Retaining white-space around "|" seems to introduce incorrect
  <pre>'s in several cases which affects parse and RTing on the
  following test pages:
  - en:Barack_Obama
  - en:Ta_Mok
  - en:Knights_of_Classic_Lore
  This experimental fix seems to eliminate parse and RT errors on
  and possibly other pages.

* However, as noted in the FIXME in the tokenizer, the specific
  fix seems incorrect since it will lead to incorrect parse in
  the following two examples:
  {{echo| }}a
  {{echo|
    }}a
  The FIXME has more details and also lists a reduced test case
  for analyzing this more thoroughly.

Change-Id: I099a7172205ec848bffdf4f66cc29d86b4ee11a6
Removed max-height from div.
Adding Filter Through Command
Site updated at 2012-05-01 21:16:31 UTC
Wat vervuiling met Graph werk.
meer vervuiling maar het werkt
SecureCommit: flotwriter

Om te voorkomen dat ik datamanager sloop.
Added Text instance.
Merge branch 'master' of github.com:AardvarkSoup/Haskell-Heap-Serialization
Fixed serialization of Integers, Doubles and Floats.
Added some comments to PtrSet.
Fixed some errors occuring in GHC 6.
update otapackage for new make file

Change-Id: Id055ba9c76ab7b96630fc51c8d5de4bfc68dd535
Merge "update otapackage for new make file" into jb
Add kernel by corcor67 for p.e (inline kernel building will be supported soon so kernel can  be updated more frequently)
i777: Sync DeviceSettings with i9100

Change-Id: I5e214f320dd72b47717c25be73b6e03e71528d81
Set interactive as default and enabled CONFIG_CRYPTO_SHA256
CONFIG_CRYPTO_SHA256 is enabled to support android data encryption and previously performance governor was default which keeps the CPU at the highest state.
Y U NO Boot

Change-Id: I1ae41659922cf197e787ab7806282cd8d5460585
minor edit to SoundController
Some recovery, updater-script, and .rc cleanup

Plus enable root again.

Change-Id: I8c9cbb98c8e5fcf68b3686c61d93528a0990153b
Animated player spritegit add .gitignore
barra lateral da home removida
titulo da home alterado de h3 para h2
lista de inscritos com tabela em html criada
mensagem da versao do sistema alterada
Merge branch 'release/0.2.4'
Github Issue Fix #4 - Dropdown-Box for UPHOURS
Update notes for submitted changes

* Fix ticker animation for centered clock
Added configuration files to the constructor
Merged..
Another attempt to fix test case on build server.
INTSAMPLES-81 File Sample: Fix FWMH Field Access

FileWritingMessageHandler:

Sample accessed 'destinationDirectory' field; it
is now 'destinationDirectoryExpression'.
Merge pull request #62 from garyrussell/INTSAMPLES-81

* garyrussell-INTSAMPLES-81:
  INTSAMPLES-81 File Sample: Fix FWMH Field Access
Change time

Change-Id: Id013d94a50785305cf4bfe47da9a73d1b99db7ae
Fixed admin_init initialization issues

Changed admin_init to check each option individually, correcting the
issue where it would always reset the values to default since the
'nbcs-moderation-queue' option didn't exist
dont copy AudioHAL
Using SystemVibrator in the cases other than Ringer.java

In ICS, Phone app was creating separate Vibrator instances in
Ringer.java and CallNotifier.java, while in Jellybean they started
relying on one single Vibrator Service.
See also Id928ffef9a87e2563198240e91184cf59ecebbb1.

It means vibrate()/cancel() calls from two files interfere with each
other. When "Emergency tone" is set to "Vibrate" in Sound Setting
(which is only available with CDMA devices), this causes unexpected
trouble; the "Emergency tone" vibration is canceled immediately by
Ringer's Vibrator#cancel() call. onPhoneStateChanged() is indirectly
calling the method.

This change stops using the Vibrator Service in the emergency vibration
case, so that two Vibrator objects won't interfere with each other.

TESTED (use CDMA phone):
- Set "Emergency tone" to "Vibrate", and make a phone call to "911"
-> The device should vibrate for hundreds of mills (even without a
   fix, it may vibrate for an instant, so need to check how long)

Bug: 6794250
Change-Id: I69e6c3d99b14b3c50c57ff5d59ca42f4ea18024f
Merge "Using SystemVibrator in the cases other than Ringer.java" into jb-dev
merge in jb-mr0-release history after reset to jb-dev
Adding contextual "Voice Mail" text to in-call dialpad.

Adds contextual "Voice Mail" text as the hint in the DMTF dialpad
editText.

bug: b/7110391
Change-Id: I85241dc7fa6768f68867fdb1237540233b8be01b
Merge tag 'android-4.1.2_r1' of https://android.googlesource.com/platform/packages/apps/Phone into jellybean

Android 4.1.2 release 1
Typos

Misstyped class name
chnged in schema file
It helps to use the right folder
remove password length validation, to set our own that confirms to BCUS policy
Rename repo name

Change-Id: I2eb56928056ea0b83cab5c58bfd5a6c452df579b
ARQ-983 prepare release 1.0.0.Alpha2
ARQ-983 prepare for next development iteration
Uploading wired utgangspunkt
Some examples about the metadata database
Describing how a parser extracts metadata from a file
Refactor: test naming
Describing what happens when a page is rendered.
[DRAFT] Cloud backup attempt
Describing mustache templating in ruhoh context
Using my fork of ruhoh
Disabling stdout spam from ruhoh, also Ruhoh::DB is no longer observable.
Ruhoh::DB#posts contains whatever metadata Ruhoh::Parsers::Posts#generate returns
Shows that parsing a file using Ruhoh::Utils returns the page content too, not just metadata.
Updated to match ruhoh v0.2.0
Reverted to ordinary because we're now using ruhoh v0.2.0
Merge remote-tracking branch 'origin/master' into temp_about_object_model
drivers/misc: vibrator code fix up from WWE ICS source release
update rc4 & good practice

update rc4 & good practice
update rc4 & good practice

update rc4 & good practice
Fixed errors in Javascript locatoin
added the link to the screencast and written tutorial on using the
plugin
add tf_daemon blob entry

Change-Id: Ib1bd4a5d16b8a86a06325ad60a14a8ff3869e086
+ explanation for what the program does
* HTMLMediaElement detection, refactorish according to IIFE pattern
  <http://benalman.com/news/2010/11/immediately-invoked-function-expression/>
  (thanks to JonathanNeal)
Fixes: #1067 Strip CR from logon scripts
Fixes: #1068 Show description on user's hotplug devices
#tech: Added a README.
Move to rf 2.7.3
Automated Snapshot Generated at Thu Aug  2 13:00:31 2012.

Snapshot at Commit on <perl-experimental>:

	a11759b by Kent Fredric on Fri Aug 3 00:58:14 2012 +1200
	"Sync metadata to Aug 2, 1200 UTC"

PORTDIR SYNC CONTEXT:

/metadata/timestamp 	: Wed Aug  1 14:37:58 UTC 2012
/metadata/timestamp.chk : Wed, 01 Aug 2012 15:00:01 +0000
/metadata/timestamp.x	: 1343831701 Wed Aug  1 14:35:01 2012 UTC
GIT-2
remember compile mode (NORMAL or LTE), even after exit
Add mod version

Conflicts:

	res/values/strings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I7e42a1bfc3060e3fc191e59cb8f1c11e731f80f8
bug #4 Solved
Add a test for 'timeout'
Removed unnecessary SoapClient wrapper, extract login credentials from
the SoapClient options as per spec.
updated version in init.rb
rmr tools before scp
temp fix of unavailable machine problem
enable ssh compression
separate benchmarking and availability testing functions from monitor script
upgrade put-all-diff.pl to multiprocess version
benchmarking parameter tuning
note planned upgrade point for task-update.pl
Emoji documentation testing.
core-3129 move delete button to the end
CORE-3756 Updated MyAnalysesPanel to allow filter by ID.

Added an AnalysisSearchField to wrap the logic of the AnalysisPanel Name and App filters, and added an ID filter that can alternately filter by Analysis ID.
Updated MyAnalysesPanel to use the new AnalysisSearchField and to filter by ID in the updateSelection method if the Analysis is not already loaded in the grid.
Updated AnalysisContextBuilder to return all of the Analysis info for use by the AnalysesWindowConfig, to allow access to the Analysis Name in that updateSelection method for display in the filter field.
CORE-3469 Added null-check to state loading mask callback.

When LoadSessionCallback::onSuccess closes the loading mask MessageBox, its callback's event will have a null ButtonClicked.
Minor refactoring in DEStateManager.

Updated the load preferences callback to use JsonUtil.getObject.
Removed TODO Auto-generated comments.
Added enableSessionSave and disableSessionSave methods.
CORE-3181 Added new cleanup calls for panels in DECatalogWindow.
CORE-3181 Added tag to new PipelineEditorPanel constructor.
Merge remote-tracking branch 'origin/master' into gxt3-sandbox
[AH] Renamed calendar.js.coffee calendar.js
added navigator.geolocation.getCurrentPosition support
Merge branch 'master' of https://github.com/interactivethings/swiss-transport-flows
epackage.shellrc: Fix option -quick, use env(1) for GIT_MERGE_AUTOEDIT=no
epackage.shellrc: (Edit): Check that *.el files exists
Applicant bean ,Mac and Applicant Dao Interface and Implementation
completed.
Move static assets into public/
Add sinatra to gems
Add semantic to gems
Update js paths
Add shotgun for development
Application.rb
Update config.ru
Add views/
ajustes na abertura de projeto
layout update, including declar. of original
mer om *pythonisk* kode og duck typing
with-uttrykk
#1161 Cosmetic changes
Merge pull request #1 from romainbx/mark-dev

#1161 Cosmetic changes
Clean up

* specify proper license
* update dependency versions
* modify example configuration to work properly with JDG 6 GA and Infinispan server 5.1.5.FINAL
* replace occurences of EDG with JDG
* clean up readme files
* simplify running example tests by using port-offset instead of virtual interfaces
Merge remote branch 'upstream/ics' into ics
Merge remote branch 'upstream/ics' into ics
Merge remote branch 'upstream/ics' into ics
Merge remote branch 'upstream/ics' into ics
Merge remote branch 'upstream/ics' into ics
Merge remote branch 'upstream/ics' into ics
Option to hide IME switcher (1/2)

Change-Id: Ide0d76d3928b380c796060dae21387852fa60d3c
Settings (Lockscreen Calendar): Hungarian translations

Change-Id: Ia7dfd9640a0f5bd345799d88e2704f6721f5a061
PT-BR: Missing translations

Change-Id: I96f3f41a01e33b3b998839e569b46c4ef6caac0a
Merge remote branch 'upstream/ics' into ics
Spanish translation for settings

patch set 6: added weather and calendar event translation
patch set 7: fixed string
patch set 8, 9: fixed typos, removed yahoo weather string

Change-Id: I16599100f7b7f21330be1149a6035e65cbe0f608
Update Russian Translation-Settings-CM9

Update Russian Translation-Fixed some mistakes-CM9
PT-PT: added missing translations and corrected pt-br words to pt-pt

Change-Id: I08143f23476cf9b26b4a296a8d67ea7f39f43b1c
Lockscreen weather and calendar German translation

Patch Set 2 - Fix typo
Patch Set 3 - Fix wording
              Add min/max temperature inverting
Patch Set 4 - Fix derp
Patch set 5 - Fix wording
              Add translation for "allow secure lockscreen to enable slider unlock"
Patch set 6 - Change wording
              Add calendar related strings. Mostly taken from CM7
Patch set 7 - Fix extra line break

Change-Id: I41082e454aff5726ec96689fb33ed68bfae48e88
Settings - Update Italian Translation

Change-Id: I086052e75ad2ebecdc5e33e9ca4cd1224d545e34
Merge "Lockscreen weather and calendar German translation" into ics
Settings: Updated Dutch translation

Change-Id: If2d455d83089e60e73f97bbafdafd7359bc4b462
Electron Beam Animation (2/2 Settings)

Change-Id: I951a3de402b3632d17b485736114fe842308d680
Merge "Settings (Lockscreen Calendar): Hungarian translations" into ics
Merge "PT-BR: Missing translations" into ics
Toggle2GService.java: tabs, spaces, brace style

Change-Id: I961d1c98b7a4cc9d69b7ee727d75a82e55c933f6
Repositioned the link
FIX: Supply context to block helper. This allows the block helper version of each helper to be used as expect. See tests for details. On that note, I think the tests could be cleaned up. I tried hard to not add bloat to the code, but I think there is a lack of reuse in the current state.
MOD: Merged pull request from johntimothybailey https://github.com/prototypef/handlebars-extensions-module/pull/1

MOD: Cleaned up spec file to reduce redundant variable declarations
Added tag rabbitmq_v2_8_5 for changeset 2d97cc80cc9a
Add iteration option, reformat console output
[wip] removed
docs, pod fix
Update to the correct version of Armstrong
Tabs to spaces WTF!!
First Proyect
organized version hope this work
update 20120531
ERC error free. Ready for layout.
Localisation updates from http://translatewiki.net.

Change-Id: If9c6e781b1c95c25e7b8ab8b742d096ea39e9d9f
Entities have claims, not statements

Change-Id: I54f71766dfe7ac20a0cca045617cdb955e72600f
Merge "Entities have claims, not statements"
aries use exynos common
minor modifications
orginial bug report removed
Update module/Application/views/index/index.phtml

Add my Assets module
Merge pull request #46 from albulescu/patch-1

Update module/Application/views/index/index.phtml
edit page

might not work
Add DeviceSpecific settings Thanks to burnsra from the CM team!
added more call to action links to Facebook on the community portal
added call to action to Twitter footer on community page
added link to YouTube channel and YouTube auto-subscribe to community portal
added direct links to join IRC channel to community portal
updated IRC view to use new cleaner footer text as on community portal view
added sub-heading to facebook on community portal
added sub-heading link to Twitter on community portal
added basic info for IRC to subheading on community portal
cacheable mixin done
integrated caching into app for rdf requests
Added a route for landing page
Upgraded AppView object and modified Backbone.Router.gotoPage() method.

AppView object is now called PageManager and contains methods for
getting the current page uri hash fragment. This enables the router to
track the current page URI, which is required when dealing with modal
dialogs.

Router.gotoPage() is no longer used to manage loading of pages and
dialogs.  differences between the two are now handled directly by the
route callback functions.
Recompile the java listener with logging changes
commented event
comment audio flags for now
d2: move things to d2-common

Change-Id: Iea25de0d1672850cdf62ad4cf5e771e4e6f69386
Update notes for submitted changes

* gpu: pvr: match version to driver
Fixed ordering of the navigation.

Signed-off-by: Florian Wolters <florian.wolters.85@googlemail.com>
Fixed ordering of the navigation.

Signed-off-by: Florian Wolters <florian.wolters.85@googlemail.com>
Reconcile with ics-mr1-release

Change-Id: Ic3ab1dc8924cb9a64bbc0e90e421fa79507ea821
Remove bt_enable log spam

A flood of "bt_enable: ret" -1" messages happens if bluetooth fails to
initialize properly. This is due to a message which seems redundant in
system/bluetooth/bluedroid/bluetooth.c

 LOGI("bt_enable: ret: %d, errno: %d", ret, errno);

If a failure happens after the 1000 retries a single more useful error
message is printing. The LOGI message above should be removed.

Change-Id: I8f7f3eca7eb7e0d7c2551a08ec976222ab95651a
avrcp quirks blacklist configuration support

complementary to commit 91ab44cc6311b08087b4000e0d109412e7cbff46:
2012 Ford audio systems are working just fine with a2dp and the avrcp
1.3 profiles. This patch allows to restore the broken functionality.
Change-Id: I6287c0c937c4fcc499fb8c4c625318b0f7c171b5
Fix error reporting of port

Change-Id: I32374d92956ea2a361ceac04b11f7cceddea519f
Status Bar Brightness Control Padding

Add a padding to the brightness control on both sides to make it easier
to reach the min/max brightness.

Change-Id: Ia42444321f82aaac97c0c442796dec551b1bcd65

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Merge "Status Bar Brightness Control Padding" into ics
SurfaceFlinger: Fixed build error for QCOM devices
Updated pom: upgraded http components, junit and gson, introduced variables
reading properties from local.properties
- player animations
- mor functions for NPCs
adding myresume
added a test when using custom mappings to avoid requerying the same
field
syntax update
code coverage update - fix for call to incorrect @future method when in
batch
code coverage update
PCLK is sourced from the sensor so don't try to drive it.
Return standard -1 on error at open
Rewrite tegra camera driver for VIP
improve battle atack button
Typo during conversion of repository location
Updated response strings
Merge remote-tracking branch 'upstream/master'
Modified instruction string "bottom to the right" to "bottom at the bottom"
Modified list1-data and list2-data.xml files for condition 2 import
Match all condition2 types in sentence result.
Match Subject ID between Database and Profile Panel.
Add line break before sentence result data.
Set conditions to "Tutorial" for tutorial sentences as a marker.
Merge remote-tracking branch 'hatfield/master'

Conflicts:
	SPRE/src/nz/ac/otago/linguistics/spre/AdministratorActivity.java
Prepare for new project SGRE.
Copy SPRE to begin SGRE development.
Add generated XML data.
hopefully sidestep issue with admin and metadata
Create the minimax function to formulate a decision tree
Se sube librería controlP5.jar
Turns out this gem doesn't support ruby 1.8. Who knew?
Added support for jruby sqlite3.
Added local references
modplug: Use unsigned instead of uint (slightly different fix than in 3.2.x).
Add Belarusian translation from Mikalai Udodau.
add some htmls for info and how to
more  update for the mongdb and structure
Merge pull request #3 from suching/master

Add some doc/html/notes and try git function
Fixing url import
reduce here point to docs and demo
Set Resize Widget enabled by default
Framework: Add Power Widget (Phone)

This commit adds the Power widget for phones.  All toggles should work
except for LTE (disabled for now)

Patch set 2  - Fixes Sync toggle
Patch set 3  - Removes WIP
Patch set 4  - Rebase
               Switch to MultiSelectListPreference

Change-Id: I17669420d9db9a347af182fc398c6426e18534f4

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml
Site updated at 2012-11-24 20:58:30 UTC
Lab5b boilerplate checkpoint
checkpoint
More changes
Site updated at 2012-09-24 06:19:00 UTC
[#37445533] Initial models: Graph Panes can include multiple datasets.

https://www.pivotaltracker.com/story/show/37445533
WIP: stashy.
Merge branch 'master' into multiple_data_sets
Merge branch 'master' into multiple_data_sets
Merge branch 'master' into multiple_data_sets
Merge branch 'multiple_data_sets'
Initial commits
erased passwords
merge from tag exdroid4.1.1_r1-a10-v0.3
Merge remote-tracking branch 'cyan/jellybean' into jellybean

Conflicts:
	include/hardware/audio.h

Change-Id: I14998d36cfbe398844e0f5d246e8c2a203b4333b
Added discussion file, used for discussion
brittanys first commit
Using replcace structure instead of iframe so one does not have to scroll
Breaking out the bootstrapping process by libraries and adding required folders.
p0408/p0409
Subscribing/publishing fix.
Alot more text written about the actor system

I've been writing the text as draft now. Some irrelevant information
needs to be removed and overall the text needs to be formed alot
better. Like i said, its just as draft. Also i will add some more
images and improve the current images. I will work on that tomorrow!!
Site updated at 2012-06-20 14:42:26 UTC
update pattern of get_log
use fulldelete function in filelib.php to delete dir
CORE-3206: always include the integration_date field in app listings
msm: restart: un-inline soc_restart function
Small IE7 bugfix: placeholder.click handler was referencing wrong $this to
get 'target' data prop
Merge pull request #5 from grrowl/master

Small IE7 bugfix: placeholder.click handler was referencing wrong $this to get 'target' data prop
Update jquery.html5-placeholder-shim.js

Hi There,

Thanks for this helpful plugin, did few tweakings to meet general requirements. I removed possible hardcodings to make it little better.
Removed lr_padding and added bottom & right paddings to the label element. Also changed top, left and width values as these are not accurate in all cases. Added backgroundColor and seted it to 'transparent' as background color is being applied to the label from existing system's styles.


Thanks,
Mubarak
Merge pull request #7 from mubarocks/patch-1

Update jquery.html5-placeholder-shim.js
Merge pull request #3 from parndt/master

Forwarding patches
apply corect base parent style for dropdowns. Fixes #10
Apply hardkey menu compatibility background. Fixes #8
added transparent style background asset and option, modified page copy
fixed xml formating
generate transparent style background assets, use dark theme defaults. fixes #2
Working prototype for RESTEasy implementation.