labofsahil/github-event-dataset-2012 huggingface dataset:
Testing for H/W video decoding support.

Conflicts:

	include/media/stagefright/ExtendedWriter.h
	media/libstagefright/ExtendedExtractor.cpp
	media/libstagefright/ExtendedWriter.cpp
Temporary commit for working qcom OMX decoding

Testing for H/W video decoding support.

Added QCOM-specific bits to cmds-stagefright.

We now have full 1080p hardware video acceleration!

frameworks/base/nuplayer: Fixes to enable HTTP live streaming

- Enable QCOM specifc color formats in ACodec
- Do not skip lines without /n, in M3U Parser
- Stop scanning sources until reset is handled in NuPlayer.

Change-Id: Ie7e902c0cd56e7aec17d0ac67d2869a7819770cd

Conflicts:

	media/libstagefright/ACodec.cpp

frameworks/base/NuPlayer: Handle Seek from NuPlayer

- Seek was handled by the source by queuing discontinuity events
  individually for each stream.With this approach renderer will
  continue till discontinuity events are handled for each stream
- With the new approach seek is handled by the player -
  - get the new seek time from source
  - flush the source TS segments in LiveDataSource, access units
    in TS Parser, decoders and renderer
  - notify current position to driver
  - LiveSession will not queue a discontinuity for seek.
- Add a mutex lock for connect & disconnect ChromiumHTTPDataSource
- Handle flush in ACodec - Idle to Executing & Loaded to Idle states

Change-Id: I8a741c2c665d3aca715734fc1fd1eeae33a6271b

Conflicts:

	media/libmediaplayerservice/nuplayer/NuPlayer.cpp

frameworks/base/nuplayer: Support for dynamic port reconfig in HTTP Live

- BW switch is detected by the decoder by a port reconfig event
  instead of a discontinuity event
- Handle port reconfig dyanamically in ACodec
  Steps are - Flush - Get all buffers back - Disable - Enable
- Handle PID change in TS Parser - Set PID based on stream type

Change-Id: I5ff494084fffa218cafd3cd6db1197aad2233c4d

libstagefright: return proper color format on target basis.

 Video preferred Color format is different for different targets.
Add a method to choose the preferred format for each target.

Change-Id: Iba28d5d6e2917792492b3b2e9d38396d468f3202

Conflicts:

	media/libstagefright/ACodec.cpp

httplive/ACodec: Enable smooth streaming

- Use property to enable - hls.enable.smooth.streaming
- Set component in smooth streaming mode by doing a setParameter
  with OMX extension for SS
- Handle Port Reconfig Info event from component
- Whenever resolution changes do update buffer geometry on
  native window

Change-Id: I694d05fe7aba2482f50f31a6e80b646822f15b31

Conflicts:

	media/libstagefright/ACodec.cpp

Conflicts:

	cmds/stagefright/Android.mk
	media/libstagefright/ACodec.cpp
	media/libstagefright/Android.mk
	media/libstagefright/ExtendedExtractor.cpp
	media/libstagefright/colorconversion/Android.mk
	media/libstagefright/colorconversion/ColorConverter.cpp
sync ebuild updates

merged:

  cbl: f49693f78dec0da294024a8c64bb40943b3c21be
Added info-page: Laden
Optimized images
Addnig VC2010 Project.
Added read more button on home page
Use the same style as signup page
added The Dish-Cleaning Fairy
added achievement and requirement tasks
New modules gender.color and wide mainpage
first commit, small addition
Little usability tweaks
Only do the system initialisation on the setup of the first project
CauseParameterInExceptionCheck was added to plugin-plugin.
+compiz (1:0.9.8.4-SprezzOS2) UNRELEASED; urgency=low
+
+  * Add X-Python-Version: >= 2.7
+
adopt tracker
adopt gthumb, update to 3.1.2
we no longer build glu as part of mesa
add policykit recipe
kill off obsolete tracker patches
why is it FALSE?
Program 8.2 square, and XYPoint
fixed title img position
Remove file test.c
Bumped SBT plugin versions
background changed to display at 1200 or more width
minor junk
added zak game
revving verision
Do not use MouseX::NativeTraits. Recommends AnyEvent.
Reformatted
Simple fake SMSC implemented with AnyEvent framework
Updating with latest code on desktop.
update readme for Yii
Added the correct sprite location for two bootswatch themes.
Renamed views.
Implemented a local strategy for authentication.
added http:// to website link on emails
CONTRIB-3537 - journal_entries.rating default value set to NULL
init commit to book puzzles
Added in glib for str, stocks desktop entry array now - ready for parsing.
Fix deps configuration in doc

Closes #67
Update send command.
updated to fix vendor bug with empty labels
Refactored nrepl and auto-complete support
fixing color.js path
Merge pull request #19 from zenorocha/fixColorPath

Fixing color.js path
Лаб3: багфиксы, связанные с синхронизацией отображения в листе
lucene 4: fix numeric types to properly return numeric streams
minor cleanup of mongo recipes
Merge branch 'master' of github.com:engineyard/ey-cloud-recipes
Log verifier test.
Merge branch 'master' into jarvis
Log Verifier function completed.
Updated Log Verifier function.
Merge branch 'jarvis' of https://github.com/erichsu/DebugToolAutomation
fixed bugs with music player
noise was overlaying other elements
Added signature lines with our names
Update to README, remove .DS_Store
Working cas auth, will fill in the other pieces to make things a little more sensible
Make the UserAuthorizationTest more interesting
Fixing json conversion to effect the correct ids
pl-632: maven-plugin-anno dependency not available in Maven Central Repository - switching to "br.com.ingenieux.maven.annomojo".
check images work in readme
CSS gravatar fix
Removed unused library (was a silly attempt to generalize the template creation)
Multiple scripts defining Cc, Ci, and Cu as "const" 2.0

https://github.com/firebug-crossfire/crossfire/issues/7
Added reminders about video acceleration.
Added removal of .git from /etc/skel
added example.cpp
Se agregar System.Web.MVC como localcopy
Agregado Flash
Small changes
Merge branch 'master' of https://github.com/franziska-zeiner/Beach_Boys

Conflicts:
	Assembly-UnityScript-firstpass.pidb
	Beach_Boys.userprefs
adicionando imagem para o facebook e meta tags do open graph
Got to be more aggressive about flushing the queue
update metric update window
Otto Gatjens Sancho
Initial upload of example docs and fullscreenbackground script.
add h_addr

Signed-off-by: chenxi.hou <you.zhou@renren-inc.com>
changed port to 8888 to use nginx proxy_pass
First commit to the GitHub report
Added BeautifulSoup4 to application, using in extractURLs function
Oops, added return to extractURLs.
Added execution of SQL for createTable method.
Split off functions into own file for clarity
Added a return to getConfig (Returns a dict)
Changed some conditional logic to be more consistent.
Random crap.
Renamed tablexists var to exists, fixed logMessage call
Fixed logic error in createTable() method
Rebuilt the extractURLs function.
Updated insertContent function to use the correct status value (0)
I did something. Forgot what.
Added timing to getContentFromURL (time in milliseconds)
Fixed conditional check in dbHasContent func
derp
Commit of unknown reason. :)
Major changes, view diffs if you must know.
Should have been comitted previously.
Added logMessage and sys.exit in case config file doesn't exist.
updated build
Revert "updated build"

This reverts commit 569767090d22b06c59df183ab5c1a86e28bb06e3.
delete file in wrong repo
make_dbrelation
modify_seed
Now the noteblock has to be two blocks under the lever and doesn't matter what line 2, 3, or 4 say.
disabled some indexes, changed how matches are fetched and ordered
Merge branch 'master' into optimize-index
fixes per Greg
Merge pull request #154 from fangeugene/optimize-index

LGTM.

Fixes #153
HADOOP-9016 (merged over YARN-204)
HDFS-4140. fuse-dfs handles open(O_TRUNC) poorly. Contributed by Colin Patrick McCabe.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1423257 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of github.com:griddynamics/yhadoop-common into trunk-gd
HADOOP-9147. Add missing fields to FIleStatus.toString. Contributed by Jonathan Allen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1423444 13f79535-47bb-0310-9956-ffa450edef68
Moved HADOOP-9147 to release 2.0.3-alpha section

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1423451 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1423470 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9152. HDFS can report negative DFS Used on clusters with very small amounts of data. Contributed by Brock Noland.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1423602 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of github.com:griddynamics/yhadoop-common into trunk-gd
Merge branch 'trunk-gd' of github.com:griddynamics/yhadoop-common into fb-HDFS-4311-trunk-gd
YARN-225. Proxy Link in RM UI thows NPE in Secure mode (Devaraj K via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1426515 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1426536 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of github.com:griddynamics/yhadoop-common into trunk-gd
Merge branch 'trunk-gd' of github.com:griddynamics/yhadoop-common into fb-HDFS-4311-trunk-gd
update 1344105741
Ändring av datum
Merge branch 'master' of https://github.com/gustavarrhenius/Varldsklass
Kat,Kur,Even, ej inloggad fix
fixing
Merge branch 'master' of git@github.com:hackreduce-mtl/controlfreak
broke some things :(
Add more useful logging to mount handler
add a user scaffold and set the default route to go there
add a micropost scaffold
set up some validation/ownership
better IP address change detection
Typo in documentation title
make it look good

done in ms office 2010 on windows -- probs best to keep all changes on
this platform from now on.
fixed all the styles so that they can all be changed together easily
menu on playlist end feature
delayed commands in playlist feature
mcca y mcc terminado
Added basic classes and initial cleanup.
new domain name structure
handy inversion processor.
Merge branch 'master' of https://github.com/horizon-institute/vicarious
added eclipse project for easy check out
Created the basic structure of the program. All that is left is to flesh out the rest of the winning hands, tally scores, break ties, and read from file
search-box style fix
updated requirements, hardcoded tags as per request for custom order
added phonesky to build
removed unnecessary files from dev branch
Encode URL
Merge pull request #12 from gjtorikian/encoding_fix

Encode URL
Added epoptes
Use fancy new NSAnimationContext APIs
change default device to d2vzw
fixed repoclient issue #1 : Repoclient fails out-of-the-box because of missing yaml defaults.
This now results in an error message if the --hostname parameter is also omitted.
Also, removed an IS24-specific default from the repoclient help text.
Convert DiscogsRelease to ActiveModel
Convert DiscogsTrack to ActiveModel
Remove Match factory
formatting
Convert DiscogsRelease data from an AR to an json API call
Add port to DiscogsService http api call
Started playing with tox, will eventually add in py26 #2
Updated Manifest Merge functionality.
Added support for SDK Tools R21.
Merge pull request #146 from tlbollwitt/forked-mods

Updated Manifest Merge functionality to support SDK Tools R21.
Added Icons for Exhibit, Exhibit Section and Exhibit Item
Merge branch 'master' of github.com:jazkarta/collective.exhibit
parse now multible xml files
Ignoring swp files
Fixing and_return expectations with false, it has been evaluated as nil and no expectation was made
[maven-release-plugin] prepare release ivytrigger-0.23
returns streams
Dump em 21/04/12
some protection against null pointers etc...
Got a basic deferred service working.
Merge remote-tracking branch 'jkarsrud/master'
Include browser-testing in ToC
Fix Sphinx warning
Replace non-existant option '--file' with '--tests'
Add gunicorn dependencies.
new background. some arranging.
Implementing the negamax.
Revised slides and slide constructions
Updated slides
Use markdown...
added default tumblr boilerplate
added disqus comments
link to home on header
Prepare for Melpa
Create pre-commit hook
Testje van jormen janssen
Testje van jormen janssen
LG Video: show image on stop event

Signed-off-by: Nicolas Lesconnec <nicolas.lesconnec.pro@gmail.com>
Fixed errors from rebase
base commit
py files utf-8
API 1.10
Push entry text to correct set
ember.js integration begins: AxApiResponse Component, AxUI View Helper

AxApiResponse Component will be used by the cake's controller to store
the data, mesages and response statuses. AxUI Helper will be used to
generate the ember.js App classes, that will be feeded by the
AxApiResponse Component.
controllers and views
Rspec and capybara tests
Rspec and capybara tests
Rspec and capybara tests
navigation links
navigation links
Remove unnecessary listing.
added profileImageUrl to tweet entity.
Added dynamic image loadingwhen detail view will be updated.
new mini mobile icon, temp fix for #81, oher tweaks
also check for psgi existence
feckin iphones
adding "~" for \cite{}.
Revert "First working commit"

This reverts commit 09d1dea40df07acf105af5c4f2761cb23b5ea445.
Revert "Revert "First working commit""

This reverts commit e223f2f91ecaddcd64d9368dda50b463d921354a.
Modify blog view to use pagination. Needs tweaking.
Remove static and media files.
Handle concurrency issues
new logo and new color scheme posts
Merge branch 'master' of github.com:kingcu/blog.ridewithgps.com
update for Mongoid 3.0.0
Fixed cpufreq
msm: kgsl: add power tracepoints

Add kgsl_clk, kgsl_bus, kgsl_irq, kgsl_rail, kgsl_pwrlevel,
kgsl_pwr_set_state and kgsl_pwr_request_state trace
events.

Change-Id: I3bf246f350b1208123ab9a33c08495cea9c533eb
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
Dropping old rubygems api crud
Dropping old gem spec api lines
Adding yammer as a runtime dependency
Setup vhosts
Merge branch 'master' of github.com:kreativkombinat/buildout.z6
Setup all vhosts
Inlcude all files in proxy setup
Added support for setting default views
forgotten files
just amp
spi_sck one tick too much
reg first_tick
communication with amplifier is working
withot first tick, not working
without first tick, it works
todo state cs_low in spi module
amp works with full clock speed
amp works with full clock speed; one useless extra tick first
maybe adc works
add new Popover configuration and add sample to Issues page (fixes #93)
improve button handling in  Modal component
fixed a hash definition for some systems (looking at you, *buntus)
Loner job with a timeout can't be enqueue again if it completes after timeout expiration
Merge pull request #14 from ssaunier/loner-job-with-timeout-wont-be-enqueued-again

Loner job with a timeout can't be enqueue again if it completes after timeout expiration
End of day WIP, got a working 'hello world' on BB Curve 3900 OS 6.0
Localisation updates from http://translatewiki.net.

git-svn-id: http://svn.wikimedia.org/svnroot/pywikipedia/branches/rewrite@10492 6a7f98fc-eeb0-4dc1-a6e2-c2c589a08aa6
Merge remote-tracking branch 'git-svn'
adding some hints to the readme file
Remove product referrals
Merge branch 'develop'
Schedule JS
Merge branch 'master' of github.com:lintseed/Hosting-Con-Mobile
Schedule styles
Pagination improvement - fix with latest version of this file
Tangible component fix

updating tangible components for satin
Added initial files

index.html contains the entire game, panorama1 contains the background
image
Mejoras que no son mejoras… problema para resolver
Merge pull request #1 from patriciogonzalezvivo/master

problema para resolver
removed plugin meta line from helper_functions and uninstall
la til farger i usermodel
Merge branch 'magneex'
Merge branch 'master' of github.com:magnevan/FellesprosjektGr14
initial UI updates. Lots of things cleaned up.
Add spatial extent support
Added first scenario pass and first few steps of scenario 2, 3
Implementei grava��o de resultados em arquivo e leitura da topologia do arquivo de entrada
Adding README.md file for nice formatting
LPS-30681 Fixing typo
Test Fixes - properties/users
Test Fixes - properties/users
LPS-30996 Breadcrumb overlaps the bottom part and hides the portlet title - Backend
LPS-30996 Breadcrumb overlaps the bottom part and hides the portlet title - Frontend
LPS-30996 missing nav tag
LPS-30996 Removed the unnecessary div
LPS-30996 source formating
LPS-30996 - Source formatting
LPS-30996 Fixing possible NullPointerException
LPS-30996 Source formatting
LPS-31209 Add a "Liberal" control panel entry that allows anyone access
Logistic Regression quase ok. Não está iterando direito, por algum motivo...
mistakes found in the train, back from Lyon
updated error checking for locations
チャートを付けた。
チャート表示ロジックの微調整
Issue #217: Change ceylond options (-non-shared and -source-code)
Add some links in the intro to particular topics
blog a status update
Fix for #75: Make API docs easier to find

Also adjusted the sidebar top/bottom margins for something that looks more centered
Fix for #75: Make API docs easier to find: added them to missing sidebars
Fix for #79: Add link to http://ceylon.github.com page
Removed reference to JDK > 6 for now
issue #78: add Tomas to team page
Merge pull request #82 from thradec/issue78-add-tomas-to-team-page

issue #78: add Tomas to team page
Update Awestruct version to 0.2.13
issue #71 - Move /documentation/ files to /documentation/1.0
issue #71 - Update links from outside /documentation to point to /documentation/latest or /documentation/1.0
issue #71 - Add htaccess rule to forward /documentation/current to /documentation/1.0
issue #71 - Change /api/current to /api/ and create current and relative urls data
issue #71 - Update /documentation/1.0 to use relative links
issue #71 - Understand staging.ceylon-lang.org
issue #71 - Update links from /documentation/latest to /documentation/current
issue #71 - Remove repo entry in urls data
issue #71 - Update site edition pages to match new URL logic
issue # 71 - Add rules to redirect form old /documentation/foo to /documentation/current/foo
use modules app_config, mainwindow_rc
Fix to zanata editor links.
remove tmp test file
Arreglado bug de camara desfasada si se cambia de pantalla con la camara
moviendose
moved typedefs into .c file
Week 3 project live session notes
New data from upstream source on Mon Jul 23 04:00:27 CST 2012
add empty production log for heroku errors
new text sizes
non functional seeker class. im working on it.
Modified main screen layout; changed icon and font and general layout.
+ added a getWorldRef in Agent in order to access World from python interface
Added draggable & droppable support.
Fonte inicial (2.6.8)
CSHARP-547: Replace use of $csharpnull with _csharpnull because the leading "$" causes secondaries to crash in server 2.2. The new representation will always be used when serializing, but both representation are supported when deserializing. This is a rare edge case and almost no one should be affected by it.
Fix race condition in test_distinct
Merge pull request #123 from ajdavis/unittest-improvements-5

Fix race condition in test_distinct
Update docs/articles/NodeKOArticle2.md

Couple typos
Merge pull request #711 from ajdavis/master

Couple typos in NodeKOArticle2.md
add db/log.php for ou developed modules #3770
Add        91369.user.js
changed printer type function
MumbleKit: sync.
Mumble: bump version to 1.1.1.
TouchScroll source codes & example files
refs4085 書誌文献の修正
refs4148 保存種別の検索対象非対称処理の追加
Assign user_data to an empty string if user_id.nil? and change back to the assignment of channel_data to user_data for the sake of clear naming conventions.
hnl_dk: add bluetooth hci event change - included in 4.1.B.0.587.

Change-Id: Ie86b8150671b611b60db53208de0f1fb365a5f36
hnl_dk: add memory management changes - included in 4.1.B.0.587.

Change-Id: I49ea0571e9bf7df428f721db48c70892b565f440
hnl_dk: add updated zram/xvmalloc - included in 4.1.B.0.587.

Change-Id: I1dfb15defc0dabd670e6b5ed2e8a59685468d3d9

	modified:   arch/arm/configs/cyanogen_akane_defconfig
	modified:   arch/arm/configs/cyanogen_anzu_defconfig
	modified:   arch/arm/configs/cyanogen_ayame_defconfig
	modified:   arch/arm/configs/cyanogen_azusa_defconfig
	modified:   arch/arm/configs/cyanogen_coconut_defconfig
	modified:   arch/arm/configs/cyanogen_haida_defconfig
	modified:   arch/arm/configs/cyanogen_hallon_defconfig
	modified:   arch/arm/configs/cyanogen_iyokan_defconfig
	modified:   arch/arm/configs/cyanogen_mango_defconfig
	modified:   arch/arm/configs/cyanogen_mogami_defconfig
	modified:   arch/arm/configs/cyanogen_phoenix_defconfig
	modified:   arch/arm/configs/cyanogen_satsuma_defconfig
	modified:   arch/arm/configs/cyanogen_smultron_defconfig
	modified:   arch/arm/configs/cyanogen_urushi_defconfig
	modified:   arch/arm/configs/cyanogen_zeus_defconfig
	modified:   drivers/staging/zram/Kconfig
	modified:   drivers/staging/zram/Makefile
	modified:   drivers/staging/zram/xvmalloc.c
	modified:   drivers/staging/zram/xvmalloc_int.h
	modified:   drivers/staging/zram/zram_drv.c
	modified:   drivers/staging/zram/zram_drv.h
	modified:   drivers/staging/zram/zram_sysfs.c
mogami: 720p pmem fix
Merge "mogami: 720p pmem fix" into 4.1.B.0.431
Added SmartassV2 governor
Removed cpufreq_screen
SmartassV2 tweaks
SmartassV2 tweaks 2
Added Lulzactive Governor v2
Added lulzactive to anzu def. config
Added lulzactive fixes by bylos
Added smartassV2 from ArcKnight kernel
Added Intellidemand governor
Forgot update in Kconfig for Intellidemand
put back sysfs protection from store_pump_down_step to store_pump_up_step (by bylos)
Added SIO scheduler
Added lagfree and InteractiveX governors
Tweaked InteractiveX governor
Forgot updating cpufreq header file
backward compatibility before 0.19.0 restored
new data.txt
Rearranged functional tests

Change-Id: I7930ca772e4e5cd031fb9c11962bd846f6f3a0c6
ch9 ex 12, 13, 14 simple encryption
plagiarize
Merge pull request #34 from nisargshah100/tk_tweeks_724

plagiarize
working search
Merge branch 'master' of github.com:nisargshah100/speakeasy_app
added file during merge issue
Initial commit
Add ui views and css
Design Commit
remove bootstrap coffee and less files
README and git ignore
Fix apache2 basic auth
add redmine agent
Drew and Scott playing with statecharts
Removing unused css from html5boilerplate template
Removed almost useless example file from emberjs
Hooked up termsController to terms view and load a few dummy terms
now showing three terms and testing new view to termController flow
Added comment explaining load function
Merge pull request #20 from Andrewmp1/develop

Develop
Added transition to new term screen.  Added button to save view to termsController but the term doesn't seem to be displaying on the index page
Merge pull request #21 from Andrewmp1/develop

Added transition to new term screen...
Merge branch 'develop' of https://github.com/OC-Emberjs/yourjargon into develop
Merge branch 'develop' of github.com:OC-Emberjs/yourjargon into develop
Added a debugging line to determine length of termsController array
Fixed termsController to correctly bind to view.  The init: method was causing some bug in ember to not update the view
Added link to terms that goes to the edit page.  Created a view & child view to get this to work.  Changed TextField to TextArea for term description edit screen. Moved Alphabet list page to its own template.
Merge pull request #22 from Andrewmp1/develop

Feature: Added link to terms that goes to the edit term view
Merged uptream develop
Moved termController to termsController, then removed termController.  Still need to fix tests
Corrected tests for eliminated termController
Added ability to filter terms based on matching a letter in the alphabet with the first character in a term
Merge pull request #23 from Andrewmp1/develop

Removing termController and adding a filter by letter
Rename taggings to record_tags.
Add ChangeLog (0.3.1)
Add Package-Requires
Merge branch 'develop'
Not -dev any more
Fix minor typographical errors in Metadata Service

Change-Id: I56ded4dbd6e8e926cd3e966bd978fe6d32424da2
Fixes: bug #1086911
removing evhttp_connection/evhttp_request structs from bindings. it doesnt make sense to dive deep into the libevent internals, so they are essentially worthless now. their purpose has been superceded by the "http-stream" branch in cl-async.
Custom font size config for CKEditor with WYSIWYG
Removed some jquery functionality replacing with native js
update
update
updated loginauthentication.php with the right path for library
namespace minor fixes and clean up
cleanup on waint.cpp and header
Revert "Update lib/refinery/i18n-filter.rb"

This reverts commit 0882f612ca119bfb0a21c05404be3f109b3db303.
Revert "Update lib/refinery/i18n-filter.rb"

This reverts commit a859533b9e21152eeb9561ca2106f1a72d5759e1.
adding fields for removing and editing answers from a question belonging a survey
Multiple file setup
Basic arduino control code
Version 0.4 -> Added error notification.
adding model and vocabulary
making ActivRecord(ResearchObject) constructor private
Merge remote-tracking branch 'pejot/master'
Fixed tests.
refactored function_keys.rb so that it's easier to follow
Changing the BreadthFirstSearchContext to a Strategy
Refactor Endpoint logic
Use public port when exposing cluster ports
Parameterize OwnedItem in Zookeeper service
More fluent interface for filters
Encapsulate endpoint logic so that all tags are built from EndpointInfo
Clean up pom dependencies for shared-utils
Add govno-code in database initializer
Images and usernames

Pablo - Added username to python constructor
Added icon files to img folder
Added icons to new goal wall posts
added master message
setup instructions for windows
fixed compatibility with SmartFolder
upped version
the last commit before db start
added code to clear instances when Processing.init() is called, to prevent duplication
added Processing.reload for safely manually calling init() after initial pageload
forgot to empty the instance id list
removed instances reset in reload(), since exit() should already take care of this administration
Merge branch 't1133' of github.com:Pomax/processing-js into t1133
removed local var for the Processing.reload function
Added Processing.reload() [#1133]
Fixed sid issue
Updated plink.js to include eBay changes and bumped version
the overwrite of getdents64 on 32bit causes panic
Specify the location of the favicon in error pages
Merge pull request #124 from lifton/master

Specify favicon in error pages
Update mocks to accurately reflect dashboard builds
Merge pull request #119 from MosesMendoza/correct_dashboard_mock_targets

Update mocks to accurately reflect dashboard builds
Hiding $menu on mousedown anywhere in document and indentation 4
Added tag rabbitmq_v2_8_7 for changeset 4e0fdda1d418
Add Perl tutorial files.
Add cpan install note to perl README.
Add guide for ubuntu install of perl prereqs.
Improve perl tutorial files.

Fixed a few spelling errors. Removed unnecessary timeout argument from
some connections. Removed on_return callback from send.pl. Modified
rpc_client to allow parameter passing. Added autoflush, $|++, to allow
for automated testing.
Merge pull request #13 from Lanzaa/master

Add tutorial files for perl.
Thanks to Lanzaa.
Added Save format: Term Links, Term ID, Term Object.
Save format fallback is Term Links
fix typo, add de salud
fixes
Merge branch 'master' of github.com:rahulagarwal30/HKRejuvenate
return id when mail added successfully
add show_all command
implemented min_local_size
Make another attemt at cahce manifest
Return nil when an error occurred

Avoids anti-pattern of testing for a specific class.
Added module for ZDI-12-169
added chm templates
added on_new_session handler to warn users about cleanup
delete comment added by error
Small description change and favor the use of print_error
Continuação dos testes
Merge branch 'master' of https://github.com/raryelcostasouza/SGCMF-BDII

Conflicts:
	SGCMF/src/teste.java
	SGCMF/src/teste.txt
JSession depends on JFactory:getApplication() returning a valid JApplicationBase object. However JApplication's constructor tries to create a JSession object which can't work.

This also lays the groundwork for lazy sessions.
sphinx support
Fix huge hole
Clean up example_simple_query_api.d
Precompiled assets for heroku
Libv8 add
- OID and configuration providers
- basic arquillian config
- simpleSNMP manager
rewrite Clustal alignment
Basic syllable count.
Cumulative syllable count.
pink before brown :d
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
mobile single page
Revise Setup .sh's so that they work (finally)

+ Double and triple ###'s were causing errors. Can't markdown git
  commits :(
Update lwjgl and add linux natives
Rebase from 'release/common_msgs' @ version '1.9.8'
Generated debian files for quantal
Rebase from 'release/geometry_msgs' @ version '1.9.10'
Generated debian files for oneiric
Imported Upstream version 0.4.14
prepare for Fuerte
Rebase from 'release/rostime' @ version '0.3.11'
Generated debian files for quantal
Update DnDB-Conqueror/.gitignore
CHANGES, Docs, version bump, and other miscellany for branching RB-1.2.
LN
Docs, Version Bump

Increase OSL Spec number to 1.2 in the .doc
OSL Docs

Some updates for the docs, chapter 7.10:
* Removed closures which are not available anymore (orennayar,
cooktorrance)
* Added basic structs (closure header + arguments) for the closures
which have not been mentioned previously.
* Some small fixes.
cmake fix for LDL issue.
Fix for conflicting function names when linking both oslexec and oslcomp libraries.
Fix for bad LLVM_LIBRARY list generation. This was using "llvm-config --libs", which is overly complicated to transform into actual file list. Instead now it uses "llvm-config --libfiles" which already contains actual full file paths, just needs to replace spaces with semicolons then.
Added build options for static libraries. These are copied from OIIO cmake files to have some consistency.

* LINKSTATIC: Try to use static external libraries when possible. This is not used currently.
* BUILDSTATIC: Build static OSL libraries.
Fix for OIIO package cmake module. The use of hints and path_suffixes makes it use the static libs provided in the OPENIMAGEIOHOME variable, instead of always preferring dynamic libs in alternative library paths. Eventually should make use of the LINKSTATIC flag to have better control over this.
Added a WITH_TESTS option to cmake, which allows disabling all the test shaders and modules. These tests are quite prone to breaking and can be tedious to fix, so this allows getting working OSL builds without messing up the cmake files by commenting out code.
Fix for WITH_TESTS option: Excluding the shaders directory completely is too much, at least the OSL header files are required in the installation files.
Use the existing BUILD_TESTING flag instead of our own extra WITH_TESTS option.
Exclude the TESTSUITE macro when test building is disabled.

Conflicts:

	src/CMakeLists.txt
Don't include cpp files from liboslcomp when building liboslexec, this would lead to undefined symbols.
Fix for static initialization fiasco with OSL TypeSpecs. The static array initialization depends on static TypeDesc types defined in OIIO. At initialization time of the 'globals' array these are not yet defined.

Simple solution is to move the 'globals' array init into the init_globals function itself (this is the only place where these variables are used anyway).
Another fix for cross-building: exclude source files from liboslexec when building liboslcomp in static mode.
Add ShadingSystem.LoadMemoryShader function to load a shader with OSO data
directly from a memory buffer, rather than from a file.
Add parameter to OSLCompiler.compile, to specify the path to stdosl.h. Currently
it's assumed to be in shaders folder next to the executable.
Cleaner Interface to Factorie models
Now prints raw XML output
Changing the link to represent the title change
only display eligible adjustments
Make compatible with Rails 3.2 mass assignment and nested attributes
Fix a mismatched button tag in the bootstrap.js template file

The list template button element was closed with a div tag. The other
files in this commit are a result of the build process.
Form, setValue sets only fields from schema
Fixes model errors not being return by validate()

Models that have a validate function and return errors in the format

  {field: 'error message'}

are being skipped. The error message is added to the field, but form.validate()
doesn't return the error, causing the form to appear valid.
*Fixed variable assignment where "var" was missing
*Added strict comparison
*Added missing semicolons
*Escaped "-" in regular expressions
More jsHint related optimization and build
*Fixed variable assignment where "var" was missing
*Added strict comparison
*Added missing semicolons
*Escaped "-" in regular expressions
[packaging] updated main directive with amd distribution
[packaging] add dependency to backbone-forms in template used by standalone amd build script
[packaging] make amd build template return Form for consistencies with other packages
add errors as separate from help
Allow the Number field type to accept decimal values.

See http://blog.isotoma.com/2012/03/html5-input-typenumber-and-decimalsfloats-in-chrome/
Fields with options should handle 0 as value

Select and other editors dealing with lists take an options object that
define available choices.
The options object handles both HTML element value and the label.

This patch makes the editors handle integer 0 correctly as a value for
the list elements.
Allowed reverse ordering of years.

Let yearStart be after yearEnd to suuport reverse ordering of years.
Useful for DoB fields where you may want most recent years to appear
first.
Add Form.setValue(key, val) option for arguments
Allow use of required validator with checkbox fields

Set return value of unchecked checkbox to undefined so that it can fail
a required validator if not checked.
Allow Field rendering context to be customized

Extract the current inline context into a method, renderingContext().
In this way, by extend()ing or overriding Form.Field.renderingContext,
one can use other data in the template.
Merge branch 'master' of https://github.com/there4/backbone-forms

Conflicts:
	distribution/adapters/backbone.bootstrap-modal.min.js
	distribution/backbone-forms.amd.min.js
	distribution/backbone-forms.min.js
	distribution/editors/jquery-ui.min.js
	distribution/editors/list.min.js
	distribution/templates/bootstrap.js
	src/templates/bootstrap.js
Limit height of UI test area
Build files
Merge branch 'master' of https://github.com/drd/backbone-forms
Docs
[Fixes #123235r1345]Last commit
parenteses
aalteração de nome das partes
alterado cabeçalho
arquivo temporario pesquisar (o git ignore para aprender como ignorar arquivos *.tmp)
added css class in sortable method
returned scoped
returned scoped in transaction.rb
modified sorta_asc and sort_desc images
modified all customers and real customers tables
modified customers css
modified potentials table
modified potentials css
modified subjects css
modified task table
modified task.css
modified transactions table
modified transactions css
schema rb
Merge branch 'aleksandr' into develop
add jquery

Signed-off-by: Sergey Makoveev aka Vano <sergey@makoveev.info>
Bringing travis-ci build script up to date
Added "bundle exec"'s in attempt to fix travis build
Documents for installation and configuration
fixing definition list problem on credits page, 105%, hope this doesn't screw everything else up????
making the definition list of Preface look nicer
delete spaces
change twitter entrypoint
display parent object attributes

Signed-off-by: Yoshini Shioi <shioi_yoshini@ogis-ri.co.jp>
update
delete
notification handling for appointments.
added compile and run scripts
moved examples
moved
addes status field showing parse errors
modified button to load new file
no file arg requiered

removed toStackTracke on loading src
added status message and return boolean on loading src
Converted tabs to spaces to adhere to the code conventions.
Adding support for date input types.
ICS_kernel
added smartass2 governor to source.
added smartass2 governor to source.
clean-up
adding smartass governor
Update source
Inital Upload
added intoout for easy in core to out core conversion
context menu in text visualization fixed
Fix profile screenshots for fixed button
Share documentation

[#30662463]
Add .travis.yml
Prefer Gradle (the repo also has pom.xml)
Oops
Use gradle test per project README
Merge https://github.com/travis-repos/java-api-wrapper
First round of updates

Clean up and separate proto areas, rearrange power supply,
address some open issues:

Closes #4
Closes #6
Closes #7
Closes #8
Closes #9
Fix reference designators

Remove extraneous designators from proto areas, make sure all other
designators are reasonable.

Closes #1
Added some more proto area

Also add value lables to most passives.
Closes #2
Closes #3
Version final 1.0 Beta
Updated excercise files; added comments with URL pointers
write, read, open working with bi-directional migration from hdd<->cloud
Autoconfigure Go's tab settings based on filetype.
added conversion check
Is it premature to call this 1.0? Naah. It's good to go, mate.
Increased number of images on demo page

Just for those large-screen people :)
moved home
fixing
I'm liking this progress
I'm liking this progress
DK
Merge branch 'master' of https://github.com/stuycs-ml7/pd7-miniproject1
lang: SerialPort - fix invocation of done action

Signed-off-by: Tim Blechmann <tim@klingt.org>
class library: SerialPort - cleanup

Signed-off-by: Tim Blechmann <tim@klingt.org>
*fixed formatting
Fortræffeligheder.odt tilføjet.
Merge branch 'development' of https://github.com/syre/SortingIndustrialRobot into development
add week4 example05
transfer query
fixed typo in the moto vendor tree
o update README
get activated
add reload option in supervisord.vusion script
fixed bug link to running simulator
fix not schedule if participant was optout
add PushTzSmpp transport
fix participant schedule update + fix register lower case keyword of request
Merge branch 'feature/push_smpp' into develop
Add desktop app build script, update package.json to depend on mongoose
Testing html5 'number' input type. Added proper styling for other html5 input types as well.
Better installation instructions for rspec-rails. Fixes #117.
Deleted DB files. This is now strictly a list implementation

I found that this project had grown beyond what I wanted it to be. Focusing
on the fact that this is primarily a refresher I'm using the opportunity to
build a basic toolkit from which I can draw later. This is now a generic
doubly linked list implementation.
Removed unused variable (aka show me the gif!)
deleted unused js testfile
fixed task renaming from 'jekyll' to 'server'
fixed a path problem with replacement of the compressed js file in subdirs
deleted package.json from shared and client as they don't use node_modules
Changed countdown to be h:m:s remaining instead of absolute time
Tilpasset FMK 1.4
Release 0.21

Modified the Server application to run as as Service and auto launch on
start up to enable it to recover from phone reboots.
added .gitignore to prevent unwanted commits
FAST and OpticalFLow for Webcam
delete hello dolly and wassup real time analytics plugins
commented out things that make audio on startup
made some comments, fixed some audit issues
add 6.1.1
comment out closeselector lines so that overlays can work again.
Really read gpg files.

.org.gpg and .el.gpg file was not loaded because not listed,
and file-name-sans-extension remove only the last extension, so only
the .gpg and not the .org.gpg.
Merge branch 'read-gpg' into my-change
Fixing offset on the show page
README and license updates
Added application cache handler.
Added basic read me doc.
Catch logic exceptions when it is about a missing parser
почти готово

вру конечно...
asesefsd
dfgdf
drtrete
Merge branch 'master' of https://github.com/vinothgithub/Jarfileproject.git
onkyocli -> testing discavery
Kleine Änderungen und Google Analytics installiert
refactor: move contextMenu to be a plugin; create public methods isUndoAvailable, isRedoAvailable, undo, redo
bugfix: undo/redo did not work correctly
feature: allow full customisation of jQuery-contextMenu
upgrade jQuery contextMenu to 1.5.25
cleanup: LegendSpec does not exist anymore
bugfix: use feature detection instead of user agent sniffing to determine cell height method (fixes Firefox 16 row header)
demo: add canonical urls and fix hosts for Google Analytics
experimental: add virtual scrolling to avoid row/column header flicker on mouse scroll
bugfix: CTRL+A while editing did not select text in edited cell (issue #35)
Merge branch 'master', remote-tracking branch 'origin'
Prevent oauth2 from interpreting Facebook's expires field as expires_in, when it's really expires_at
Updated to latest ZendSkeletonApplication

- synced as much as reasonably possible from most current
  ZendSkeletonApplication
Updated to latest PhlyPeep

- Ensure we have doctrine/common for annotations
- rename velocity template to cobertura-build.vm
- fix JUnit test case wrt. to temporary source directory creation
- pull setting of encoding of source files up to plugin class
(configuration needs still to be added in configuration view)
- Make BuildFileGenerator more testable.
- improve test coverage.
add package level javadoc.
add selection of source file encoding.
make methods final that should not be overridable.
Create Use Case - Navigates to User Console
troubleshooting POST error
Rebase from upstream
Trimmed the branch to only the robot_model sub directory
shorten quick refreshes again
mudancas no sql - limpeza
Merge pull request #6 from kureck/master

Limpeza de SQL
Testing code generator
fixed form to be combatible with symfony 2.1
note:inserter
program edit added "Program Name"
Slightly changed a logic of swiss groups building

! Also loosers now have a chance to play after round-robin stage
even if some groups has less count of players.
users/new created
choose first free new name for newly created workspaces, rather than simply conflicting in certain cases
Working on library update algorithm
More progress on the library syncing algorithm
Almost done with the library add request, just need to fix something with the JSON format
added nginx+unicorn+runit support
sync repo
Fixed URL of QR code, removed table it wasn't being rendered as I expected.
Getting ready to actually publish this.
Revert "adding in verbose to the test-run."

This reverts commit b5dd097d789bc4da6ddb933b5b839308a5e188b3.
first tests with the filereader api
more DB updates
add trinity option for combat routines
Data base from php myadmin
Various improvements related to very high latency situations (trying to
minimize occasions where drawing looks very bad, even though it's still
compliant with the protocols).
removed custom viewletmanager, changed browserlayer name
Add post about 3 nano seconds difference
BOSH testing
apply patch for NH-3226

Solve collection was not processed by flush error when lazily loaded
collections are touched during a flush operation.
Modify CameraColumbusViewController so it doesn't set the camera transform after translating.
Fix CameraColumbusViewController zoom.
Fixed pedestals

Just for decoration, currently. Enchantment glow isn't rendered and
enchantments are removed. :(
Pull some initial microbenchmarks from svn
Checkpoint concurrency material and accompanying
header updates.  Make sure copyrights are correct.
completed the new scene-template system, and implemented it for game scene and tutorial scene. tutorial scene still have some bugs
Fixed some more bugs with tutorial. It is now working as it was
Site updated at 2012-07-08 17:00:03 UTC
Sync changes from wpcom
Camera : Animate snapshot in later stages

Animate the snapshot in the later stages.
This avoids the issue faced when taking a picture with flash on,
where it animates too early and preview overlaps post animation.

Change-Id: I1fb558db9896bfcd5b4fd590f14632ba2d804e33
Allow configure touch to focus timeout

Allow user to configure the time to be with the focus after touch.
Added option to configure also the time to infinite.

patch2: rebased
patch3: rebased again

Change-Id: Iedfcbcc37659bddadfd335c7e13f2ef5af2ad26c
Updated to 1.3.2-R2.0.
Added ability to see student predictor
Added commas to number views
Forbids replacements in some tags, classes and ids.
Commit after merge code done
Merge pull request #8 from BibAlex/yosra_updates

Commit after merge code done
remove fancybox
add page criar_conta
added some warnings and analyzer fails
2012-10-29 18:00
Fixed the syntax of the example.
Removed default param values and updated the inline docs to reflect this.
lagt till lite bilder i sida1.html
2 intento!
Gemfile production
Devise: only allow signed-in users to create new users
Ownership: claim Person.user if current user not live salesperson
relayout playlist cell and video cell. Put the duration/count label on the thumbnail
buttons in video detail screen
implemented a hack to keep youtube cookies
Method changes from June 1

The momentum calculation and parameters in the other methods still need
to be sorted out
Removed @error.sort that caused and hash to hash comparison error
Get rid of 'give a talk'
Had no idea that I could use markup with readme files in GitHub
Updated with old files
Site updated at 2012-05-28 12:46:46 UTC
Initial commit: minor changes.
Added weekly reports for week 3 and week 4
...
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/OptionState.cpp
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
所有state完成，编译通过
修改缩进。。
..
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/AnimationState.cpp
	src/main/AnimationState.h
Merge pull request #87 from LiuJack/master

所有state完成，编译通过。
added alarm message;
Primera version de hoja de estilos
Hechas las correciones sugeridas en el código de la versión anterior 9dce73a. Closes #11 #6
Initial commit
Merge branch 'master' of https://github.com/FloreDiallo/sip_voicemailWEB
Opening external files uses File() instead of FileCI()

External files do not need any lower-casing of paths and doing so
prevents the opening of any files located on a path containing upper-cased
letters.
MassExporter - outputDir.mkdirs() before we try to write files to it
Support for libacm

- Streamline the code facing the external audio converter. Everything now
  goes through SoundUtilites, which calls AudioConverter for creating
  the inferior process for the external converter.
- Support decoding acm files with acmtool from libacm, in addition to
  acm2wav.
- Add the option of choosing which converter to use to the menu bar.
Merge branch 'devel-sound' into devel-ci-sound

Conflicts:
	src/infinity/resource/sound/SoundUtilities.java
	src/infinity/resource/sound/WavResource.java
	src/infinity/util/MassExporter.java

Also replaced File() with FileCI() as appropriate.
now using Bootstrap, cleaning up CSS a bit as a result; changing timesheet lines to ease importing of data from Tryton
Solution and spec for task 02
Add an .rvmrc file
First draft of task 02
Fix some typos and make some clarifications in hw 02
Make a clarification about the forbidden `eval` in hw 02
Add solutions to task 02
Update 02/solution-2.rb

Mistaken method name from solution one edited.
And "self" removed and added in some places.
Initial task 03
Enrich task 03 explanation
Merge pull request #1 from hrvladev/master

Minority changes in solution-2.rb
Rename solutions
Merge branch 'master' of https://github.com/fmi/ruby-homework

Conflicts:
	02/sample_spec.rb
rate adjust, move cancellation to end of script
Add test for CLJS-266
CLJS-266 port namespaced-keyword fix by Daniel Skarda to current codebase
* src/clj/cljs/analyzer.clj: comment about role of *reader-ns-name* and *reader-ns*
Merge branch 'master' of github.com:clojure/clojurescript
Merge branch 'master' of github.com:clojure/clojurescript
* Fixed: m_vehicleSeats -> Wrong initialisation size in memset (Vehicle.cpp)
added Google analytics code
case study styling, yeaaaaah.
responsive styling for images on project pages
switch responsiveness to a less doc
Fix removing extra 'Tab' in all record of study sample files. (fix to both header and records)
Merge pull request #21 from proccaserra/master

fix to extra unwanted tab in study sample file
fix BackToKill after it got transfered to RomControl
track twisted bionic repo again
Fixed german download page
Check config file exists before include.