labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'latest-sauce' into working-branch-zero
LINARO: CI add debian and debian.linaro from packaging branch/template
LINARO: LT: CI: Start new packaged LT kernel release for origen
LINARO: LT: CI: add origen specific packaging files

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: LT: CI: Update configs
linux-linaro-lt-origen-3.4 3.4.1-3.3~lt~ci~20120604002216+1338775155
        created from:
        LT origen tree:
        tree:git://git.linaro.org/landing-teams/working/samsung/kernel.git
        branch:tracking
        commit:f11e84f2d39de88fe9c2e03a334404407e9205cb
        CI linux-linaro tree:
        tree:git://github.com/jcrigby/packaged-linux-linaro-3.4-ci.git
        branch:shared-only
        commit:4c308edbe7c7bb76e4de4159b650c81565d737f9
        Flavour specific package files from:
        tree:git://git.linaro.org/people/jcrigby/linux-lt-ci-pack-info.git
        branch:lt-origen-3.4-package-info
        commit:7d5beaf4e40594f124ac84ef37deb833fd56ff6e

upstream-lt-commit-hash=f11e84f2d39de88fe9c2e03a334404407e9205cb
commit f11e84f2d39de88fe9c2e03a334404407e9205cb
Author: Tushar Behera <tushar.behera@linaro.org>
Date:   Wed May 16 11:49:22 2012 +0530

    CONFIG: ORIGEN: UBUNTU: Add initial config file

    Signed-off-by: Tushar Behera <tushar.behera@linaro.org>

package-info-commit-hash=7d5beaf4e40594f124ac84ef37deb833fd56ff6e
commit 7d5beaf4e40594f124ac84ef37deb833fd56ff6e
Author: John Rigby <john.rigby@linaro.org>
Date:   Tue May 22 21:49:26 2012 -0600

    LINARO: CONFIG: update config for new kernel and turn on CONFIG_DEBUG_RODATA

    Signed-off-by: John Rigby <john.rigby@linaro.org>

linaro-sauce-commit-hash=4c308edbe7c7bb76e4de4159b650c81565d737f9
commit 4c308edbe7c7bb76e4de4159b650c81565d737f9
Author: Linaro CI <john.rigby@linaro.org>
Date:   Mon Jun 4 00:23:21 2012 +0000

    LINARO: Linaro-3.4.1-3.3~ci~20120604002216 shared only

    Signed-off-by: Linaro CI <john.rigby@linaro.org>

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Removed LAM Family statements

Natalie mentioned that they were no longer in the namespace.
fix camera preview and video playback
blog update - nowish
order events even when using multiple feed URLs
sql install script for banners
fixed a small bug in docs
It's now resizable after the animation.
Fixed a typo and updated a screenshot.
Merge pull request #9 from lexrus/master

Add a new method to resize semi-modal view (could use for handling text input)
Issue #48 worksforme
Issue #49 worksforme
yeah andri
Removed some CVS crap.
Cache the popup content last time in localStorage
increase Version to 1.1.1, and ship it!
Revert "Update link to jQuery"

This reverts commit 7bbe802ecbafbf418e13d741caeef0cf1ac648a9.
Added Paper Directory
fix a typo and set the running user for init database script.
Fim da aula noturna de 08-11-2012.2
Site updated at 2012-10-25 08:20:58 UTC
Begin Invoice
changes in api-health
no linking to api-health page
Merge pull request #55 from aleml86/master

API-Health page
dfergtyuııoğü
Structure from motion
Structure from motion
moved slide_6 to products.less
Fixed gallery scrolling (Snapping does the alignment). Added Footer styling
Merge branch 'master' of github.com:milkpluschocolate/Hackman-production

Conflicts:
	handy/assets/css/style.css
	kaari/assets/css/style.css
	noh/assets/css/style.css
fix mins
Revert "Use the already defined Logger instance."

This reverts commit f4c39b8f1bae21264daa3d4c4eb06c75df30be83.
update gitignore
remove log from repo
ignore log
add ERB to the test config file to provide some coverage
bump 1.0.3
added flickr link to small talk article
Change the name of the article.
Update article on Heroku configurating.
Site updated at 2012-11-02 07:13:56 UTC
-was looking for imports in the html and not links. DOH
Add fieldgroups for user account form
Preserve start date for patterns throughout claim split against p14n base. Add test.

Release new plugin version
Merge remote-tracking branch 'origin/master'
PMO-2057: mismatch of arguments
PMO-2047/2049: calendar year volatility field added and result tree extended in several places (legal entity, segments)
PMO-1619: replacing IllegalArgumentException with InvalidParameterException, no longer swallowing exceptions
releasing new plugin version 0.4.8.11
remove dep on TT
Working on Kyle's Macbook
add getAuthHeaders
Cleaned up directory a little.
some files has been removed
another faculty member
use size_t and u_char
Merge pull request #2 from mozatkey/master

fixed warning for size_t and u_char
hi
add facebook support
add facebook support
Add other template and test
A tiny sync with v-d in LLGLSandBox/LLViewerParcelMgr
Expose pick import/export feature

Why did Beeks ever comment this out? Certainly works now...
Sync more code with upstream, Translations galore, even translations for AntiSpam!

Updated AntiSpam with documentation, safety measures, and better presentations and clarifications for the end-user from FS.
If it looks like something was removed from an xml, it was just moved to fall into place better with v-d.

Corrected log end message being log start message.
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
Improve on translation in llviewermessage.cpp

More sync with v-d for llviewermessage.cpp
space changes mostly
Fix for P2P Voice Volume slider overlapping End call button.
Space, the final frontier
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
Fix Sound Upload not working

Was broken by a change in f77f846c8dfa185aa9c7a07fe51840e21679a9c2
Thanks to Lucia TopHat and Tazy Scientist for helping me test and confirm all this.
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Fixed code examples in annotations
refactored location form, created location new view
reduced cache expiration to 1 day for flickr images, added contact us to nav
turned off caching in development, saving location_changes on delete
fix git reviewrequest to work with https github urls like https://github.com/socialcast/socialcast.git
change example to socialcast-git-extensions
PR template update according to new PR flow
Incorrectly had ! for non image link
bump version
update to latest master
update to latest master
Merge pull request #19 from socialcast/support-https-repo-url

fix git reviewrequest to work with https github urls
bump version
Merge branch 'master' of https://github.com/socialcast/socialcast-git-extensions into review-buddies-support
Site updated at 2012-11-09 07:47:00 UTC
Renamed to django-ios-notifications (Django iOS Notifications)
add posts add posts.
update basque translation
add spanish translation
Merge pull request #1 from erral/master

Updated basque translation and added spanish translation
Split paragraphs into lines for easier editing
Kays comments
rework dropout handling
TreeFrog app-server for Windows service supported.
Merge branch 'master' of github.com:treefrogframework/treefrog-framework
Initial project skeleton
Added first impl and a test
renaming of holding package
basic impl and test for reading
Refactoring, introduced custom converter
Updated ConfigProperties.xml files with comments
copy gfortran libs to R libs folder to simplify library resolutions
restart preview on picture size changed without resetting states

Change-Id: I5bb9cafc87399907e9b11ccda418b355842030c2
camera: updated german localisation

Sadly the last release was broken or my .git folder was dead...
Patchset 2: Fixed so long stings.
Patchset 3: Fixed tranllations issues.
Change-Id: I0c229e52449aae618ab9b87b67a6157813b0689a
add option to restart the preview before taking a picture

Change-Id: I13db1653cdd9285388145c47b6de7c674edf4b5b
Merge "camera: updated german localisation" into ics
Merge branch 'ics' of github.com:CyanogenMod/android_packages_apps_Camera into opensensation
clean out everythings
barabone
Updated docs
Merge pull request #92 from offlinehacker/master

Updated docs
- upload --resume switch implemented (requires bookkeeping).
- switched to using archive_id as item key in the bookkeeping db.
- added updatedb command for people that are upgrading to change their db.
- updated readme to reflect changes.
- some minor clean-up of the files.

Fix for updatedb.
It didn't work as it should...

Fix for Python <2.7

mmapping file now in parts, instead of trying to mmap it completely.

Fixed upload of large files.
Mmap has a 2 GB limit; now mapping the relevant part of the files (either the part to be checked or the part to be uploaded) instead of attempting to map the complete file in one go.

Hope to have improved reaction times on the connection (see issue #71)

Added resumption of downloads (untested).

Download resumption stage 1.
Works mostly (hash check currently fails and needs work).

Implemented download resumption.

If the flag --resume is given, glacier-cmd will check existing data in <out_file> and if it matches, continue the download from where it was.

fix

Implemented parallel upload sessions.

Added command line --sessions to give the number of upload sessions to use.

It is far from perfect: at the moment issues with upload processes dying (amazon rejects our signature, as if the key is invalid?!) and then the whole thing just hangs and needs to be killed manually. This needs a workaround.

Updated documentation to include the new options and commands.
Merge branch 'parallel_uploads' of git://github.com/wvmarle/amazon-glacier-cmd-interface into parallel_uploads

Conflicts:
	glacier/GlacierWrapper.py
	glacier/glacier.py
further implementation
Renaming project to the ZeroemApiSecurityBundle
remove vendorsetup entry

Change-Id: If000838b54672da8e613e610aa08448f8958ed08
Build
Merge branch 'master' of github.com:ApplicationCraft/applicationcraft.com
Merge branch 'master' of github.com:ApplicationCraft/applicationcraft.com
Merge branch 'master' of github.com:ApplicationCraft/applicationcraft.com
Disable backuptool
mango: update market keys from Sony 4.1.C.0.7
nypon: als wip and power_profiles
Update notes for submitted changes

* exynos4: ui: define USAGE_HW_FIMC1 to support gralloc
mms: updated hungarian translations

Change-Id: Iff06063b7011e729ba463ec7141e334c9937b216
Messaging: Add the ability to mark a message as read from the notification

Note: It will only show on single threads, just like the Call action

Also tweaks the settings strings a bit

Change-Id: I2ba1d8e592338f378a5e4f1c719cfbcca3788df8
Merge "Messaging: Add the ability to mark a message as read from the notification" into jellybean
Changed the license to MIT license
- fix: improved error message for user in case of error 904 (no matching
challenge)
Added activity chart for viewing with touch gestures & minor cleanup
Statusbar transparency (2/2) - CM
add missing }
missing variable declaration
another fix
another one...
another
test
fixing...
First pass at externalizing battery and clock configuration.
ball stop on pause
Merge branch 'master' of github.com:JaWordBreakerSushi/JaWordBreakerSushi

Conflicts:
	bin/game/Interface$3.class
	bin/game/Interface$4.class
	bin/game/Interface.class
	src/game/Interface.java
drop unnecessary jackson dependency
Fix a bug with zero activity
Add the result code value
Finish testing sweet
Make BOP_ACTIVITYDATE environment variable
add test for chargeback_update_request
clean up extra diag messages
Fixup chargeback_update_request
Date format does require leading zeroes.
Oops, read the wrong environment variable.  Fixed.
croak is easier for troubleshooting missing arguments
added all 4 tests in the litle spec
test resource
added images required by the unit tests
Merge pull request #6 from oaxlin/master

Chargeback suite fixes.
Update README.md
Merge pull request #11 from Andrewglass1/patch-1

Update README.md
Spelling error correction
Spelling error correction
Clean up

Change-Id: Ie3434de17e8ee4993b8144cd4ad35257f62a195a
added mobile browser detection and implemented basic website design
Merge branch 'master' of https://github.com/MMTLukas/trinkbrunnen_salzburg_webapp
Made viewportchange.js default to false in the jsregistry.xml since the scaling that was happening was not the viewport itself but gravity of all things after talking to Ethan Marcotte and Luke W.
Account Register POST
Merge branch 'master' of github.com:ShulipaNik/BinaryStudio.CompanyPortal
update debugger documentation
NavBar Ring Custom Targets (2/2)

Navring IME Switcher & Ring/Vib Toggle (2/2)

adds extra options to use as the NavRing targets

Patch3: added ring/vib
Patch4: added ring/silent & ring/vib/silent toggles, created icons for everything
        fixed the the toggles array and replaced the ring/vib.silent icon
        replaced the 'silent' icon because it was hard to see when it was semi-transparent
Patch5: added correct patch descriptions
Patch6: fixed a few more icons for consistency with SystemUI

Change-Id: I0161e59be2a9cb405bac67d8af80c7a494c0bb68

Conflicts:

	res/drawable-hdpi/ic_sysbar_ime_switcher.png
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/NavRingPreference.java
update toro files

Change-Id: I29baac4b3efd0d3c91f3c518e696ea8a6932d288
Advanced forums added. Some css problems fixed.
add in vzw apn permission apks
Merge pull request #81 from STS-Dev-Team/ics

add in vzw apn permission apks
telephony: CDMA: fix ERI display when device is in airplane mode

currently when a CDMA device is in airplane mode, the ERI display
shows "Searching for Service"
the radio is OFF, and not searching for anything, so fix it to
actually display the radio status correctly

Change-Id: I3acfb509291867e1a8e35163a89d86719aa40479
telephony: HTCQualcommRIL: add QualcommNoSimReadyRIL based HTC RIL

HTC Ville (One S) requires a no sim ready ril, with some HTC specific
changes, such as custom radio power on and iccIO.

Change-Id: I58150e8046da95ebb11a4c78a8441b814ce4fb5d

telephony: HTCQualcommRIL: clean up processUnsolicited

Based on rmcc's processUnsolicited cleanup commit.

Change-Id: I00f266c52d281ed92b9f8dab0f3c432acc24c6e7

telephony: HTCQualcommRIL: fix signal strength calculation

HTC RIL defines a custom signal strength packet format. Modify the
signal strength packet data such that the framework signal strength
calculation function understands it.

Change-Id: I8640c2ab31f06740325f440ae4aa4a0953968146

telephony: HTCQualcommRIL: add custom sim pin/datacall functions

HTC use a custom function set for data call and simlock functionality.
This patch fixes sim pin and 3G-2G switch functionality.

Change-Id: Ieb4b47501fe1665620afa4d58616180f6c516d9e
Revert "Electron Beam Animation (1/2 Frameworks)"

This reverts commit ccbeb68b9fc9911df627197c882cfe595e52c9b2.
Restore Electron Beam [Working]
Improved logging (fixed reuse logger name bug, adjustments)

The same name where used (due to overloading) for all loggers. Now it
uses a module wide logger instead of instance wide. In addition to this
some changes where made to make the logs clearer.
Fixed bug where small Ant FS message where ignored.

The size assumption was computed with the assumption that there
would at least one data octet, and it used > instead of >=. Change
it to allow empty packets as well, should be no harm in that.
Refactored wait code to avoid duplicate code (more general now)

This is also done in preparation for adding some better error
handling so we can correctly react to errors at some point.
Various cleanups:

- Removed old commeted code
- Added a stop function to ant.base.Ant
- Reworded some comments
update CmCircleBattery to StatusBar options (2/2)

Change-Id: Icd5222225aa273cac4f3a8732b0f7dcf1828da6f
Add pom.xml
Sample
Updated video, ril, bluetooth, wifi
Updating the gear list.
Merge pull request #1 from aaronrothschild/gh-pages

My first pull to my own master
aaron changes
aaron changes
cname
index
AAE + KissInsights
Merge branch 'gh-pages' of https://github.com/aaronrothschild/influitive.github.com
new index
new index
parse
update to AskanExpert

formatting changes and text
Chono qui refonctionnent
Started working on the input.
Updated for plugin.audio.rdio release 1.5.0
added basic make files
deadline low latency
Add regex match option for LDAP group members.

Added a feature to allow you to use a regex to match an LDAP member
field. But upon further review, I don't think it would ever be
needed unless someone's LDAP was really mis-configured. So this
commit is for posterity only.
(cherry picked from commit f5b2b5c7d0a02577f36782bebfdc5ff2082f9951)
Adding back docs for this feature.
Putting back the old Synopsis.
Updated JSDocs to latest build
Updated JSDocs to latest build
Added entry to jobs.txt for  job
Updated root index page with new entry for job WebWorks-API-Docs-smartphone-soa1.0
update wysihtml5
update wysihtml5-bootstrap
use dot-notation to satisfy jslint
use dot-notation to satisfy jslint
reduce goofyness
pull options from widget definition to wysihtml5 javascript via data attributes. update example
default should be tabs
default value for options should be empty hash
add test cases for all 4 types of navigation lists
scss touch & small-sizes
Model ==> SSqlModel
Fixes typo in Legislator model's verbose_name_plural Meta property
wplike radme
removed stuff about counting prefixes
tsabusa: add header for new liblights

Change-Id: Ie027781c5c18519adde90f83955b7a42d053439b
Update source/getstarted/helloworld/extend/content.rst

Wrong name of content type referenced in text
Update source/getstarted/helloworld/extend/view.rst

Changed the view name to correct one
Merge pull request #132 from Adniel/master

Minor, but important corrections to code and instruction
Fixed wrong css property name.
Fixed Page "Preview" button for Rails 3.2+.

(See "https://github.com/rails/rails/commit/e29773f885fd500189ffd964550ae20061d745ba".)

Also added minor optimization.
Some fixes, adding converter from old tracking system (cookie)
added foundation
finished version 0.1.0
new icon (thx to hd-trailers.net)
Send user-agent and updated changelog
added ability to override content-type in movie-view
Fixed responsive topbar issue.
fix issues registering and unregistering from main events
getting ready for pull to refresh lists and added new refresh icon
d710: signatures and permissions
d710: New apks, sigs, and permissions
d710: add update apk
d710: fix module conflict
d710: change wimax.jar
d710: fix it
d710: signatures
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	d710/proprietary/system/bin/bcm_dut
added blackback.png required by viewtype_showcase
Add OSProcess
removed redundant blocks from quote
Correct pulsar name image file correlation in resource file
Closes #4. Added correct parsing logic for irregular scenarios
Including unistd.h in ProcessLaunchingPlugin.cpp
Return the value of pump() in process()
New blog post
New blog post
New blog post
New blog post
Work on new blog post
Work on new blog post
Work on new blog post
Work on new blog post
Work on new blog post
Work on blog post
Work on blog post
Work on blog post
Work on blog post
Add RSS icon
Do not generate dated files
Clean up directories
Original gsitemap extension
Creating own gsitemap script
In the multipart form handler, convert the form subject to an instance variable earlier so it is accessible in the controller part actions.
Version bump to 0.0.9
Merge branch 'development'
Hmm here comes the license . . .
Proofread home page
Installing cake
Added teams, commitees, and people
Updates
Clean up
Config settings
Updates
Updates
Removing database settings
Merge branch 'master' of https://github.com/kimmellj/roller-derby-team-management
Fixed iPad views, question views (temporary, but legible)
Fixed iPad Views, Question views, updated gitignore :P
Updated detail views (On iPhone Interface); Now shows full title, author, and even avatar (buggy)
I /think/ I finally got the login stuff done… With ASIHTTP. Oops.

Somebody fix it, login /might/ work. There's more stuff to be done.
Like actually be able to do stuff while logged in, and verifying we are
actually authenticated.
fixed a lot of compile time errors, didn't break anything, hopefully
Fixed Codesigning, oopsie
Added compile instructions to README
Merge pull request #1 from caughtinflux/master

Fixed Compile Issues, added compile Instructions to README.md
Fixed 500/403 Errors when logging in. A bit of cleaning up, still using ASIHTTP…. Don't kill me.
XCode is retarded.
Fixed Compiler Errors
Merge pull request #2 from coolstar/master

Fixed Compiler Errors
fun, huh?
Fixed Runtime Errors
Some iPad fixes… The UI still sucks. Somebody fix please.
Merge pull request #3 from coolstar/master

Whatever.
Moar iPad fixes + runtime fixes for you peoples with deprecated shit.
Merge remote-tracking branch 'JBQAMobile/master'
Update .gitignore

Ignore new breakpoints.
Added Images.
Added a realworld example
a brief future work section
Déplace tous les fichiers à la racine
Atualizado o index
complete evaluation for crank
complete evaluation for crank: nice output, extra routine for computing averages
evaluating results for all parametrizations
benchmarking for couple of classes with all parametrization methods and crank
added paper structure with files for the corresponding subsections
added sources to bibliography
first draft of a publications ontology
notes file added
AndreiLux:pegasusq: reduce sample window and adjust hotplug accordingly
commit e2b991d605128e8517a282cde7b6c0eab8715d95 1 parent 95e251878a
AndreiLux authored a month ago
Variation on binding router method by drosen

Adds a default binding router function that supports dot notation
namespacing.  You can override it by settion options.bindingRouter to a
function that accepts the className and bindings variables.
day 5 copy edits
Splitted cliend and admin + mousetracking
Add mashamurashko to list of 4clojure users.
Twitter Bootstrap mit Skeleton ausgetauscht
psd-änderungen
Adding convertPointFromView and convertRectFromView
Merge pull request #1 from sarfata/master

Add support for converting from view geometry to image geometry
NXP-9826: Display subtab contentview related to subtab actionId - Display tab contentview if subtabs empty related to tab actionId
Ported basic styling from tile.
Layout mostly complete; added contact form.
Added form-fields abstraction.
Slight tweaks.
stopped creating a directory for the ini file and simply now uses the same directtory as the script
Add markup field module, add instruction field, & update permissions
now with rides ;-)
updated readme with specific counter add/remove instructions
adding amounts to gateway options
Merge branch 'orangelake' of github.com:portablemind/compass_agile_enterprise into orangelake
adding rescue nil just in case
Upadated knitkit to use nokogiri 1.5 or higher (originally = 1.5.0) cause savon calls 1.5.2.  Also updated acts_as_fee to replace deprecated save_with_validation! method
update to sync my knitkit.gemspec to origin
added state for returned payments
removing build_node_tree(true) from setup_connection as was done in rails32 branch, this improves startup time
removed code that adds amount as an option in the options hash
Merge branch 'orangelake' of https://github.com/portablemind/compass_agile_enterprise into orangelake
fixing bug whereby a template could not be cleared from cache
refactoring
making CompassLogger path configurable
updating readme
Merge branch 'master' into orangelake
fixing s3 permissions
fixed insert link at cursor
merging s3 fixes from rails32 branch into orangelake (95bea11b3785c3221dc073e26d13ac2b15a1a125)
erp_tech_svcs bugfixes and specs pass

Conflicts:
	erp_tech_svcs/lib/erp_tech_svcs/file_support/s3_manager.rb
fixing s3 issue where empty dir contains itself
fixing s3 delete dir bug
added Thread variable check for multi tenant
Merge branch 'master' into orangelake
tweak to cache key
adding showEditorToolbar config option to dynamic grid
Various and sundry post updates
Improove README informations.
fixed typo in flie_subscribe.launch. and added output=screen for listener
renamed a few git related scripts to start with the word 'git' for easy autocompletion.
referene is not manditory
Merge pull request #4 from andrewjpage/master

reference is not manditory
Updater ukr-rus localization of the "seen" string


Signed-off-by: semteacher <semteacher@gmail.com>
Fix for default portrait rotation

Change-Id: Iff7fd9f556bf92524a2a63b4368e0ddb6c59f627
fix for depreciated insert_actor api
Merge pull request #76 from darkxst/gnome3.4

fix for depreciated insert_actor API in Gnome 3.4
Update Logisism_2.7.2_fragile/Logisim Fragile 2.7.2/src/com/cburch/logisim/std/arith/BitFinder.java

Updated by Mark Burton*
start find a property page
Smarter indentation.
Possible sun bugs
coding style and docs update
resolve merge conflict
Hability to select image size.
Bumping version.
add version 1.7
y u have trailing ); in code examples?
Merge refs/heads/jellybean
Merge branch 'jellybean' of github.com:xAOCPx/packages_apps_BasicSmsReceiver into jellybean
tf700t: bluetooth dun fixes

Change-Id: Ie77f6b5b37d9035205f77fa3365af7016aacaa9b
Github c'est de la merde v 1
empty commit after version 0.4.5
TRIVIAL handling the case where there is no remote branch
TRIVIAL changing git-py to gitpy
Revert "TRIVIAL changing git-py to gitpy"

This reverts commit 82b3e059a952b770c37958549f92d9a35f01f79b.
updated project files from skeleton
Merge branch 'master' into develop
Finished release v0.4.6.
Updated README to show how to use the drink API
Merge branch 'master' of github.com:JackWink/Fuck-the-name--lets-get-drunk

* 'master' of github.com:JackWink/Fuck-the-name--lets-get-drunk:
  Backbone.js initialized
Do not tell people to implement TitleProvider. Closes #119.
Revert "ooops"

This reverts commit 43f336de0d12d85116dbfaa3cf14206fde171254.
Added all of our models to admin.py
Readd Mecha/Add Vivow/Remove N7000

Change-Id: I130a0912357e358b39c87fb225ae3cf5baf8da2f
test for include AST templates
libaudioeffect_jni: GREF leak fix for JB

- Excessive JNI global reference in AudioEffects.
- Global references created during native setup
  are not deleted.
- Global references are deleted in setup failure
  and during native release.

Change-Id: I302b7f8de7189f85fd07167b950f85795ffc5ef1
CRs-fixed: 413633
Added Synchronization block to avoid Race condition

While removing the top activities of crashed process from the
history stack sometimes it was leading to race condition and decrementing
history stack index twice. because of this index out of bound issue was coming

Change-Id: I2a5667d36aaa7c3b7adac347db6c9bc7429d9444
CRs-fixed: 381904
framework: fix reference leak in activiy manager

Change-Id: If7f27ea35f5a1d1dd7c98fbe5f92729ab9ba0257
Fix: Circlebattery has additional docking battery indicator

As pointed out by Aaron Echols, i forgot about docking batteries.
This patch adds an aditional circle, if a docking battery is attached.

Aaron pointed out, this is important for 10.0.1 release

This patch also fixes a small xml screw up, which created a problem on really high densities.

Patchset 2: Switched position of batteries and cleaned up the code accordingly
Patchset 3: Minor fix of wrong variable name

Change-Id: I2b437bac3428362f3865110d4bb08fad1e5f078c
Merge "Fix: Circlebattery has additional docking battery indicator" into jellybean
Revert "Add simple caching to XML compilation"

This reverts commit 2e39691d11a6559950f05ef8220c57909840675b.
Cache resource ID lookups in aapt

This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.

Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8
Merge "libaudioeffect_jni: GREF leak fix for JB" into jellybean
Merge "Added Synchronization block to avoid Race condition" into jellybean
Merge "framework: fix reference leak in activiy manager" into jellybean
Longpress hardware key actions in PasswordUnlockScreen

Change-Id: I8e2cf5d839e907344e83c29846bbcb59dfbeabca
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jb-mv
updated refresh icons
added toast messages when not connected to master backend
Moving theme chooser back up, didnt like it below EVOLUTION
Assignment 4, Task 3 COMPLETED
Added test module for testing with core
Added integration-test profile
Updated plugin.yml to support permissions.
Updated auto-builder to generate correctly.
Add PUT and PATCH /categories/:cid in the README
SystemUI: Implementation of Provision Notification Design
32bit makefile
fix JSON and loop
improved tape movement
Merge branch 'master' of github.com:SeniorSpielbergo/Teamprojekt-WS2011-12
abc.css file deleted ans RajamantriChorSIpahi modified
new plugins, more toolbar
gpu/parallel example
updating ignore
Initial commit, official htcdev src
adding cm defconf
Revert "Add custom carrier label function (1/2)"

This reverts commit 0dc07cb84eb7056a9069980f1c790774f460628b.
Fixed MPP header image bug
Updated post about prepare-commit-msg with explanation what the script is exactly doing.
Refactor message handler to deal with multiple 'message' types.
remove catch all exception handlers
Replaced March with May and added James
Site updated at 2012-08-27 03:53:52 UTC
ProjectTests : environments
add contentflow structure
move text to below gallery
successfully integrate
Fixed bug where particles had a self gravitational force, which caused nan in Price routine.
bump up flex plan
Update recipe to use new address helpers.
Fix up ha-filer code to use the new netowrk helper code.
Merge pull request #9 from VictorLowther/pull-req-feature-ip-hacking-master-f4b6b60de1

Rewrite network barclamp to manage interfaces directly. [3/22]
zero
one
deleted
Migrate post: No a la tauromaquia.
added circuit board pattern
Site updated at 2012-12-09 08:38:35 UTC
Really added 6-8
Putting this back since it works from within the build environment.
We do need to make sure that we have a parameters.yml file
Cambio de editor (la versión anterior no funcionaba en Android).
Site updated at 2012-07-06 05:12:04 UTC
post, a restatement
added function to create interactive html file for each individual to the util.py script
Update ch.epfl.insynth.build/pom.xml

I renamed the repositories for Indigo and AJDT. 

This does not change the way it is build, but we have local mirrors for these
repositories, and mirrors are based on the *name* of the repository, not the
URL. Therefore, to avoid re-downloading all the artifacts in Indigo during 
the nightly builds, I renamed them so our mirrors kick in.
Merge pull request #1 from dragos/patch-1

Update ch.epfl.insynth.build/pom.xml
Space are betters
Merge branch 'master' of github.com:lppl/sublime-text-2-User-configuration
Litt videre på reglene.
Example repo URL - see Github issue 516
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #666 from nathanl/example_repo_url

Example repo URL - see Github issue 516
Updated gems and rubies to 1.9.3
Merge branch 'master' of github.com:imathis/octopress
Fix for issue #622

The filters bundled with Octopress are not applied to files ending in 
`.md`, because the match in octopress_filters.rb does not match `.md`.
Merge pull request #706 from Confusion/patch-1

Fix for issue #622
bumped rbenv version fixing #743
Merge branch 'master' of github.com:imathis/octopress
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #675 from zlu/master

Update Github API to V3
Twitter API call and links are now protocol relative
Merge branch 'master' of github.com:imathis/octopress
Using https instead of protocol relative urls, for Pinboard and Twitter feeds
Disabled Rsync delete by default. Closes #787
Merge branch 'master' of git://github.com/imathis/octopress into source

Conflicts:
	.rbenv-version
	Gemfile.lock
	Rakefile
upgrade octopress
now we can observe all the functions
now we can extract the lengths of the examples
waliji experiments completed a bit more
added in a facility for finding what the most frequent kgrams are
roc functions added to in order to handle non-regular inputs
adding in a loop to get the length of the examples and such
created a file for doing fast likelihood computations
made a save point for the inferred patches
added in a pickle of just the templates for visual inspection'
added experiments for tuning different variations on the features
changed french class names to english
Merge branch 'master' of https://github.com/marminthibaut/artificial_consciousness

Conflicts:
	App/artificial_consciousness/src/ac/analysis/structure/Atome.java
MySQLのインストール手順を追加
PostgreSQLのインストール手順を追加
Remove redundant 'yes'es and answer third question
- sortierung nach kürzel statt nach nachname, vorname
- spaltenreihenfolge geändert: kürzel, vorname, nachname statt nachname, vorname, kürzel
Pull name, initial_token, seeds and listen_address from attributes
Merge pull request #3 from calebgroom/master

Pull name, initial_token, seeds and listen_address from attributes
Camera now disabled
Search, Tile and Duration Since last registration

Fix clear search result

Added Tile support
Added duration since last registration as default value for next
registration.
Last Duration- Only added if less then 12 hours since last registration.
Compile stuff
Spanish translation scrapping added
Merge branch 'master' of github.com:mohamagdy/mosshaf-translation-scrapper
Updated robots.txt for onestepcheckout (MAGENTO-496)
added group populations menu
toolbar css modifications
Cleaned up extension resolution
merge sort fixes
version 1.46 - fixed some minor lighting issues, actually added cocoa beans this time.
lighter data for usmap
reload method
making test user Bob to review a movie
Another format proposal for Licentia.
Keep building for lulu.
Translate another.
More index entries.
Update with new indexes and wrap lines.
Typo.
More index entries.
Remove some useless white space causing trailing spaces in the .po file.
Update with new indexes and wrap lines.
Derive name of .fo file from name of .pdf file.
Update to current version.
added border on all stage
Added warning about running on the file:// protocol
Rewrote the call to the worker thread & the response so that it can easily run synchronously or async, for better debugging
Added comment to explain data structure
Simplified by removing last_round logic (we only do 1 round at a time now) and converting callback APIs to normal function return APIs
Final tweaks to fix the bugs in the algorithm

Stopped team data from coming back from the generation engine, b/c
ApplySetNew() was exploding the counts
renamed g_aTeams to just teams in the generation engine
Switched to isLeafNode() to verify that the leaf nodes were getting scores
calculated, even when the last one is a bye and may not have a site.
Reset the g_lowest_score and g_best_sets every time so that they don't
interfere with subsequent runs
Moved ApplySet() to Round.initialize() so that it gets applied for
historical sets too
nächste Korrektur
Link to comments
changed the search a little
Build JSON object using JSONObject class
update kobe-blobs

Change-Id: I4bab211584124c24ad49ab05daa3aa437e248994
NEW Added some content. Minor template modifications
Fixed some typing errors in Placement Opportunity domain class
prettycode 3
Revert "Remove CMUpdater Strings"

This reverts commit c42d5324812f8011e0debbf74dc08d4f77be0ec5.
Display : Enable rotation on large screens

The auto-rotate toggle in statusbar is no longer present, so the check
is no longer valid.

Change-Id: I0a23e251b3cb793481d14ea8ad8a9079c7c0e962
Merge "Display : Enable rotation on large screens" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1
Patch Set 2/2: Add an "Automatically Connect" option for WiFi networks

Relies on: http://review.cyanogenmod.org/28529

Allows the ability for a user to determine whether to connect to an SSID automatically.
e.g. At work, there are several SSIDs with long, complex keys.
    I don't want to connect to them all of the time, but would like them to be remebered.
The default behaviour is to allow automatic connection, as it is today.

Patch set 2 : Fix capitalization & whitespace

Change-Id: I0f0aa64498115e3e1058f73113d37df63ab72d60
Settings: Use new Lock screen drawable

Credit to Björn Lundén for drawables

Change-Id: Iffd6d8574448f69f876ea4ccd1f6e15d60b92982
using deface instead of spree theme hook for admin import product tab
[maven-release-plugin] prepare release thucydides-jbehave-plugin-0.9.0-beta-4
Change versions for carrierwave
Select random and the latest bicycles and show em
Fix header
Add random bicycle
Fix minor errors
Style fixes
Changd pattern for naming image files, changed path for bicycle images
Minor fixes
Add default image for bicycle
Add default image for bicycle
Minor changes in templates
Add info about current user, create helper for taking last photo for bicycle
Fix layout
Move default bicycle image to another location, rename 2instance variable for current user
Updated views for user and bicycle
Update helper methods
Fix incorrent bicycle owner name displaying
Adding login through VK.com
Resize images to width and links to fullsize image
Add forgotten configs for OAuth
Increasing ringtone volume option (2/3)

Patchset 6 : Rebase
Patchset 7 : Rebase
Patchset 8 : Fixed SeekBar padding

Change-Id: I66870ece23ed471c685afd79a3e5efbe19678588
two slides & talks
ACTUALLY added apparently missing /system/lib/modules folder
Fix table options fail

Change-Id: I09cf5ae608492975924bb1581dea12e6d2a9687c
Merge "Fix table options fail"
Add whitespace filter, pull out stdin in filters
frontpage amend lose/add samplers JF
Backup 20121029
Slide home
Backup 20121116
Merge remote-tracking branch 'origin/3.1Backup' into Release3
Merge remote-tracking branch 'origin/3.2' into Release3
Merge remote-tracking branch 'origin/3.3Backup' into Release3
Merge remote-tracking branch 'origin/Release3'
CM9-Camera-Update Russian Translation
Add basic event loop for the monkey
Created Final Presentation
fixed null connection and closed connection, handled applications errors
gracefully
Update notes for submitted changes

* wingray: Enable UMS for external SD
Torch: Dutch translations

Change-Id: I89fdf6531f507373bbac93df96bc1c123028f0db
external reference pointed to wrong location
fix build, already defined
libstagefirght: Fix for data loss in A2DP playback with repeat mode

- Data loss is observed in A2DP at the starting of
  second playback with current song repeat mode
-When the file EOS reaches Awesomeplayer calls seek to zero and
 pause the LPAplayer till A2DP thread sent all the data to A2DP.
 Since decoderThread not aware that LPAPlayer in pause state it
 keeps on calling fill buffer.But A2DPThread will be blocked till
 LPAplayer resumes from pause.So buffers which fillbuffer returned
 in pause state are not sent to A2DP and these buffer will be
 over written.
-Added the condition to avoid fillbuffer in decoderThread when
 the LPAplayer is in pause state.

CRs-fixed: 351079
(cherry picked from commit b2ecd5f5b39e3fbee3f73f533897b0d14624244a)

Change-Id: Ib424a5f5794f91df4cad4fbbd7ab27faffcc4ba2
libstagefirght: Fix for music skip in LPA A2DP case

-Portion of music repeating twice after disconnecting and
 connecting A2DP
-When A2DP disconnects, timeplayed will be updated with the data
 sent to A2DP. But Decoder thread already has some decoded data
 which is not sent to A2DP.Here if A2DP connects back decoder
 thread calls fillbuffer with the  time played position.
 Because of this fillbuffer getting some of the decoded data
 which is already decoded earlier.
-To address this issue when the A2DP disconnect and connect happens
 clearing all the buffer which are there in response queue.

CRs-Fixed: 356571
(cherry picked from commit b52619bdc157646278fce30ceb84057370f030c1)

Conflicts:

	media/libstagefright/LPAPlayer.cpp

Change-Id: I98578d4470021757625ad1203682da4bb45cd055
NuPlayer: Shutdown audio deocder during seek for DashLiveSource

Shutdown audio deocder during seek for DashLiveSource

CRs-Fixed: 346380
(cherry picked from commit 241cf5298f6a8f670ebaa20e11053cb71bb7bb06)

Change-Id: If3aae86420cc3e2054eb5f1a43ca5a50c66b2d1c
(cherry picked from commit da31cf6ea370713008f822a7e2ebcaa02ce2bf51)
(cherry picked from commit 0a226ef99607d7efbfca2ebccd0f78bd066cbf5c)
stagefright: Turn off verbose logging in LPAPlayer

Change-Id: Ibe7edf9cd8a86f486eda8f2826e645b11151cd95
Revert "libstagefright: Fix MPEG4 timestamp"

This reverts commit 4b60cd365fb611d5cbbee27f3e073456c3822385.
aapt: Remove terminal pointer incrementaion

When initialization, 'end' pointer refers terminal
character in a string. But it is incremented in
while loop. It occurs the access to non-secure memory.

Issue detail
  http://code.google.com/p/android/issues/detail?id=24896

Change-Id: I751d1154d797738c87a66374a66933528c045be5
frameworks/base: Dual-pane options part (2/2)

Conflicts:

	core/java/android/provider/Settings.java
Restliche Folien ausgefüllt
reparation menu gauche
Added table of contents to handout
<td id="footer" style="visibility:hidden;"
update to newer API sync -> use
Fixed Class instance configuration lookups.
runRecSys.sh is fixed
Merge branch 'master' of ssh://github.com/RobertOrmandi/Gossip-Learning-Framework
Updated _posts/blog/2012-08-01-your-filename.md
STS-2999: Add Java home option to launch config, similar to gradle prefs page.
Add source attachements for tooling api jars to .classpath
Convert core plugin to Gradle Project for open-source nature ids etc.
Fixup resource filters in root project to hide subprojects inside of root project.
Update readme.md to have detailed instructions to setup development environment and target platform.
included site folders and the amazon payments library
Merge https://github.com/StudentAnswersDevelopers/StudentAnswers
commits: new blaster test0024
Corrected the way that messages are created. E.g., now using messages.AddMessage instead of arcpy.AddMessage.
Added documentation.
Extended Fluid Template.
added files
removed node_modules, included in package.json
Add a comment about the version of ImageMagick
Adjusted some markup and modified description from project
Remove page two from ThumbnailList demo page for simplicity.
Change the syntax to use (< and >) in place of { and } for Cartesian products
Experimenting with defining generalised interpolation library that can interpolate within an arbitrary vector space.
todo
Io Day-1
Changed which files are excluded from the git commits
used dashes in Ids added more tests
Recycled my code from the query for differentially expressed transcripts page to make the query for transcript isoforms page.  The latter now has all the same features as the former.
lic header changes
Small typo in README.md (postgres)
Merge pull request #112 from jarlarntzen/patch-2

Small typo in README.md (postgres)
Fixes: #1693 when using the fai summary tab PHP error Undefined index: FAIclass
Updated Titanium SDK to 2.1.4
Merge pull request #1 from airamrguez/master

Updated Titanium SDK to 2.1.4
cambios en segmentacion
Merge branch 'master' of https://github.com/gustalibreros/LEARNING_IMAGE_PROCESSING
add index.html
Merge branch 'master' of github.com:helenkellogg/opentutorials-helenkellogg
fixed small JS glitch
initial commit of example spring batch
migrated innerframe to use page parameter, added back and contact links to header, fixed catalog page, cured cancer.
propelBundle migration
Named rails version
fixed wrench bug
BoardConfig: set TARGET_NO_HW_VSYNC := true
Revert "BoardConfig: set TARGET_NO_HW_VSYNC := true"

This reverts commit 1f11dc63d4386d817523eab95ac391278996e159.
include/linux/msm_mdp.h: Update header
prepare release 0.4.3
Add redactor JS instead of CLEditor
resize image and edit some css code
Fixup favorites in kickoff
change existing file method to use with self defined parameters for thumbnail_url, url and name
Add hdpi/mdpi images for Nexus 7 and full tablet mode support
Close all connections before forking.
Bump
Fix for PHP 4.5 call time pass by reference in Add from server plugin
Update copy for sidebar-book widget
Social links on author pages
Copy update for 404 page
Add links to partner logos in footer
Added past event listing to /event
Removed sub-head from /review page
Copy fixes
Update to All Modules page to link object labels to their listing page
Update to All Modules page to link object labels to their listing page
Merge feature/September-18-12
Trying to add readme file again
Added tag rabbitmq_v2_8_7 for changeset 211920c5152d
audio/msm7x30: Merge with CAF

Change-Id: I53341f0be1bc3e4a1b8ec65e85b49809b724c4f1
audio/msm7627a: Derive AudioPolicyManager and add FM device

Change-Id: I92794dfb7e3a84b382ebf2dd2f9fa787f777b725
audio/msm7627a: Handle error cases during postproc enable

-No sound is audible when audiofilter.csv file is not present
on target or error in parsing the file.
-DSP gets enable of legacy postproc features during SRS enable
with invalid values and crashes DSP. This happens because of
legacy postproc features being enabled even when there is error
in parsing.
-Disable enabled postproc features in error cases.

Change-Id: Ica8deddc8919351c6ff34c0eecd95a58cf2bc25f
CRs-Fixed: 384251
Merge "audio/msm7x30: Merge with CAF" into jellybean
msm7x30/AudioPolicyManager: remove erroneous QCOM_FM_ENABLED ifdef

An incorrect ifdef in AudioPolicyManager::startOutput prevented the
output device from being set if QCOM_FM_ENABLED was not defined.

Change-Id: Idaad10edf198a790249ad5b4902c7309fe032d65
alsa_sound: fix a merge error which broke LPA functionality

Change-Id: Iccfdca5c81ca0f12a6cea9a1f78c34a1a1b14561
alsa_sound: Fix EOS - Seek issue.

Seeking to EOS in tunnel mode is causing no audio. This is because
zero length buffer is not handled properly.
Fix is to not send zer length buffer to driver if the queue is
already empty.

Change-Id: Ie598bc89e20e6c7c5a0d65b54ceeea6cade0087d
alsa_sound: Add miscellaneous fixes to AudioSessionOut.

- Remove reset from stop function. reset should be only called
  in the destructor as it closes all the threads and deallocates
  all the memory
- While iterating through the Device list, break out of the loop
  once the use case corresponding to the device is removed.

CRs-Fixed: 396029
Change-Id: Ifa449fc5aba93b3e88c52f55219110027e4a8684
(cherry picked from commit 991d9cae7c96338691ec2bbf2aad7ddc6328a6da)
Revert "audio/msm7x30: Merge with CAF"

This reverts commit 6a885942e6a1178c2ccc3ecfdd200127f8874777.
Revert "msm7x30/AudioPolicyManager: remove erroneous QCOM_FM_ENABLED ifdef"

This reverts commit de20d4fa8109c445e42451e0e414b92fc08a2135.
Imported Upstream version 0.4.6
Imported Upstream version 0.4.7
Revert "Revert"

This reverts commit 80cf0bef7cf664dd53ced301511a5fbccd6ae1b7.
[MOD] Just using setup leads to some options being null. This is why we use build now instead of setup.
Custom place markers.
updated ruby 1.9.2 to p320
CREATING 2.4 TAG FOR youtubegallery
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>
(cherry picked from commit 5eb00c0353bc1987b1e40759c172dd2a839a4707)
Added acsccid 1.0.2
improve category & tag label
Site updated at 2012-09-01 13:38:40 UTC
First Use: New Style & Layout Work

* Convert to using white text on a black background
* Minor layout fixes for the buttons

Open-WebOS-DCO-1.0-Signed-Off-By: Josh Palmer <jpalmerwatkins@me.com>
de.po: core: add options to use different color for offline nicks in prefix
Register 4 adittional datatypes as being supported by Wikibase

Datatypes added in https://gerrit.wikimedia.org/r/39014

Change-Id: Ie279db3add29835edb13b532e4017553cd5501bb
Merge "Register 4 adittional datatypes as being supported by Wikibase"
(bug 42910) load sitelinks from table, not item object

Change-Id: I228161f96b377e7ecc51389c460a32ad8653c4d5
Splash screen updated
Merge pull request #3 from ignaciogs/master

Splash screen updated
Another atempt at fixing display resume
Fixed CloudCamp tweet