labofsahil/github-event-dataset-2012 huggingface dataset:
fix valide
Merge branch 'dev' of github.com:syddjurs/cmstheme into dev
White-panel 1
Added profiles for Qt Jambi jar
Merge branch 'master' of github.com:syncloud/syncloud

Conflicts:
	desktop/pom.xml
added a Socket mock for later testing
Fixing fullscreen switch
Repository Initializing
Merge branch 'master' of github.com:szaghi/Lib_VTK_IO

Conflicts:
	README.md
added menubar - working additional skip test
Why do I even have this?
First commit
Merge branch 'master' of https://github.com/t00ts/HibernateAS
Buttons in groups
Comment out some block-in-memory code
log4jのデータも追加しとく。
this is authenticate form
adds gvim local
Faster NaCl builds using cnacl

This provides an alternative NaCl formula using the cnacl project.
cnacl is an alternative build system for NaCl which uses cmake for the
build process and supports plans for commonly used architectures, as
opposed to the NaCl library's own build system which performs an
elaborate set of benchmarks to choose the most efficient implementation
for the underlying architecture.

For comparison, here's before:

    $ time brew install nacl
    ==> Downloading http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2
    ########################################################################
    100.0%
    ==> ./do
    ==> ar -r build/horus/lib/amd64/libnacl.a
    build/horus/lib/amd64/randombytes.o
    /usr/local/Cellar/nacl/20110221: 41 files, 564K, built in 12.5 minutes

And after:

    $ time brew install nacl
    ==> Downloading
    https://github.com/cjdelisle/cnacl/archive/f23fbf8e17771d3623a91db13239f456277ba945.tar.gz.tar.gz
    ########################################################################
    100.0%
    ==> cmake ..
    ==> make
    /usr/local/Cellar/nacl/20110221: 26 files, 416K, built in 6 seconds

The build time went from 12.5 secs using the original formula to 6 secs
with the cnacl-based formula. That's over a 100X speedup! (EDIT: I have
now enabled tests, which brings the total build time to 17s for me)

Using cmake also dramatically simplifies the formula, which previously
had to work around the library author's's nonstandard build system and
architecture-specific file locations.

In addition, a warning message is added to the original nacl formula
which informs people that they can get a faster build with cnacl.
six project test
Cleanup of migration file and move of seeds to db directory
script for letting people in
add personal file
Merge remote-tracking branch 'matthew/master'
Merge remote-tracking branch 'matthew/master'
Matthew
more stuff
change sample 1
added new pull request
Bug 796739: [Clock] remove inline scripts
permissions
review comment
settings.json change
Merge pull request #6063 from gregorwagner/settings2

Access fields and settings.json
Bug 799037 - Make remote time actually use remote time! a=fixes-test NBOTB r=mdas
Merge pull request #5983 from ochameau/csp-clock

Bug 796739: [Clock] remove inline scripts
Merge pull request #6092 from lightsofapollo/integration-test-random-timezone

Bug 805334 - Make remote time actually use remote time! a=fixes-test NBO...
Reduce the item numbers per page to 10 on import preview.
Added the groups field to the MembershipDefault.
Adding and editing surveys behaves the same now, fixes #1
Merge pull request #5 from thadd/1_save_and_continue_editing_new_survey

Adding and editing surveys behaves the same now, fixes #1
Sniff test for Ipad on Cloud and Local
Site updated at 2012-12-28 00:57:21 UTC
whitespace!
steal grb's git aliases
steal grb's 'run-command-on-git-revisions' script (u rock man)
ignore backup and tmp  vim directories
steal grb's githelpers
remove backup script, as it's not relevant to me
remvoe git compltetion script from bash as the modification of IFS is causing interactive rebase fail
add standard name/email to gitconfig (erb overkill)
correct pretty git log regex
only show first 8 chars of username in pretty git log
stubbing out context lookups
Working Hello World, Problem1, Problem2
Initial search deploy working
Link to complete documentation in the README.
Update podspec for 0.1
Add iOS version of existing guides

* Add iOS Best Practices
* Add iOS Style Guidelines
* Add iOS Protocol
Combine iOS guides into existing guides
checks the cluster for images
don't bother trying to retrieve the image from ourself
Trying again SolidCube Box13
Apagar tudo, borracha e palete de cores a funcionar
Merge pull request #1 from tierney/master

Base for Python code.
Merge pull request #2 from tierney/master

Basic Python working implementation.
Merge remote-tracking branch 'paul/master'
gitosis: starting to implement the gitosis.conf change agent

This agent will receive changes in the "Changes" channel and proccess
them. The change is a simple struct with three fields: Kind, Args and
Response.

Kind is an integer, but you should not use a magic number, but one of
the package constants for messages (AddKey, RemoveKey, etc.).

Args is a map of string to string, containing the arguments for the
given change. For instance, the AddKey change, requires the arguments
"key" and "member".

Response is a string channel. If the change returns anything, it will be
sent thought this channel. The AddKey change returns the name of the
file where the key was stored, and the caller should provide a channel
to receive this.

I've also unexported the functions deleteKeyFile and buildAndStoreKeyFile.
These functions are not supposed to be accessed directly anymore. The
same will happen to other functions in this package.
cmd/tsuru: docs for version
Added link to definition manual
adapted (german) help page to most recent changes
Added the property `statusCodeDefinitions`, removed the magic method `__call`
New Collision

Use world::trace
New collision*
Merge branch 'master' of https://github.com/timvdalen/OGO-2.3
asset path flag
Merge branch 'master' of https://github.com/timvdalen/OGO-2.3
Support bots
Refactoring: Person > Agent
Added podspec for version 1.1
Działa nauka!!!!  xD
Merge branch 'master' of github.com:tobikster/Zakuwaj
Przed zajęciami 2012-05-16
Dodanie widoków, namiastka logowania
improve cmake check for boost and jansson. fix hash_ring test and timer_event_loop benchmark. remove ucontext.
json-path can now convert to/from msgpack and sort keys
admin panel text formating
Basic authentication with Devise
Addind missing files and changed sqlite3 to pg
setting up a database
Basic navigation through authetication: login, sign in, logout, edit
changed  header a little bit
added profile for user and messing with heroku and email sending
removed mailcathcer it does somethong bad to heroku
adding Gemfile
Attempt to send mail through sendGrid
A config for Heroku Sendgrid
Disabling email send for Heroku.
messing with emailer and forms
Added note and fixed missing character at top of
Emma firmware
add MultipleForm
Work on interfacing with the computer
jakie to sa pierdoly
Stop Mogu destructor from calling freeReplyObject
Add vector initialization
Implement value callbacks. Make messages parseable in test_text action.
Convert whitespaces to spaces
Added pages controller
Done with static pages
removed spork require
rspec runs without error
Mark up fixes.
Add tpope/vim-markdown
Remove JAVA exports from .zshrc

They are provided in dedicated profile.d script
Pimp my XMonad config

- `dropboxd` now runs as rc daemon. Remove it from startup items.
- improve `unclutter` flags
- improve multi-mode support: `managehook` is now mode-aware
- fix bug in replace script, which was preventing XMonad from
  recovering saved state when replacing an active Gnome 3 session.
Don't throw from SCOPE_EXIT
spelling
zshrc: add vi-mode plugin
zshrc: add debian plugin
display:block to bg3
Add better screen shot and update readme.
Enable site update
New disqus field in site creation/read/update for later disqus integration
Disqus now enabled on pages
issue #9: don't assume default branch is 'master'
Changing Bam! to Wireframe 3000
plz dont break things
increased version number to 1.2
complain about non-expected database directory versions
updated to code example in javascript.html to match the actual code in the example
Upgrade manifest.json version to 2

ref: http://code.google.com/chrome/extensions/manifestVersion.html
This is my first comment.  I hope it works.
Updated GetCurrentPosition to reset maximumAge to 0... I mistook the
value setting

Change-Id: I06b16799b400ecba5891bb355239d1ae3696bbfe
init.el: turn off tool bar early in startup to avoid momentary display
Setting up mongodb connection with mongoose
Fix a typo
Fix typo on error handling
Keep fixing typos. =.='
Probably need to have the if statement in order to throw.
It was the error to connect to db at 8080…no need to fix so many typos. O.O
Update uri for mongodb database
Implement '/ws/parks' endpoint with mongoose
restart again
add error handling
Update schema and try to bypass the Error: unauthorized db:parks ns:parks.parkpoints lock type:0 client:127.2.132.1
modify role and permission controller
html5 boilerplate, QUnit
More grabber stuff build is broken @ mom
increase height of homepage jumbotron, update vars and styles of popovers
Finish of close conversion from a to button
Merge pull request #2817 from andriijas/2.0.3-wip

Finish of a.close to button.close
terminal colour display program

I wrote my own program for displaying all the colours a terminal
is capable of displaying.
Add MVCArray to Plovr configuration
Add more compatible MVCArray implementation
Add more specs for Request#blocked?.
default repolist uses /var/cfengine
Single quotes.
Add codeclimate.com
added "map" page content
Ask for help on setting up the UG in "Let's start a Ruby User Group"
added factory boy, test for DetailUserView
volumenes  75%
Added the negative log-likelihood cost for a one-hot encoded target
Changed the cost base classes' call signatures and used NotImplementedError in their call methods
Added a missing GeneralCost __call__() method signature
Added a Cost superclass and multiple GeneralCost subclasses
Merge branch 'new_sup_costs' into working_copy
Fixed what broke in sgd.py with the addition of new costs
Merge branch 'new_sup_costs' into working_copy
Added a KeepModelParams callback to do early stopping
Changed comments a bit
Merge branch 'model_keeper' into working_copy
Added needed theano and numpy imports
Merge branch 'model_keeper' into working_copy
Added verification to make sure a given dataset does not get added twice
Merge branch 'multi_monit' into working_copy
Added .idea-folder
Footer and header added to the base.html
Change class name in model
Merge remote-tracking branch 'remotes/origin/Cesar' into Ching-Yao

Conflicts:
	trades/views.py
merge
make offer
README.txt
changed templates/detail.html to GameDetails.html
Merge branch 'master' into Victor
update models and views
Adds Sign in page
Fixes background and static references
Merge branch 'master' into Victor

Conflicts:
	templates/base.html
add models.DateTimeField(auto_now_add=True) feature in models.py, and update related functions in views.py
Added the forgoten files
Added stuff to views in user
Merge branch 'master' into Victor
asdfasdfas
Shows current user in header
search_page.html modified with links and list arrangements
updated user/views.py
modification on iteration page
Merge branch 'master' of ssh://github.com/venkatnr/xplanner
Renaming trait name UniqueStr to Trimmable
调整数据库为PostgreSQL
删除无用类
调整好添加数据库纪录的功能
Added recursive functions.
Fixed render problem in friends page.
Fixed resource problem in friends page.
Registration mostly working. Can't figure out why the prepare doesn't work
Merge branch 'Vince' of github.com:vincetran/SAPIENS into Scott
Registration works!
Merge branch 'Vince' of github.com:vincetran/SAPIENS into Scott
Version 0.5 build 000005 - Big UI Change! part 3

1. Better UI for the Sitewide configuration or config.php editor in the
AdminDropMenu.
2. Issue concerning .jpg , .jpeg, .JPG, .JPEG extensions now working in
ReThumb tool was fixed.
3. PNG Support was added to Photo Module.
tweak show / hide events
Merge branch 'master' of github.com:visionmedia/uikit
build
Add profiling support.
Fix bloat test.
Properly read replies that are bigger than read buffer.
+ ondemand as default
+ test wjchen's suggestion to prevent page allocation failure problem when toggling wifi.
+ Linux 3.0.29 - http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.29
sched: LOAD_FREQ (4*HZ+61) avoids loadavg Moire

LOAD_FREQ is (5*HZ+1) to avoid high load average when idle:
http://kerneltrap.org/mailarchive/linux-kernel/2007/10/3/328568

I suggest (4*HZ+61) for a better distribution.

With some seconds based load (like SSL heartbeats)
and LOAD_FREQ at (5*HZ+1) I see Moire patterns like inverse sawtooth,
since 2 or 3 probes hit the jobs (load increases quickly),
followed by several probes missing it.

A 4.61 sec interval gives optimal distribution over when within a
second a probe is taken, as .61 is close to golden ratio phi 1.618...
(test in http://ripke.com/goldenratio.c).

12*4.61 = 55.32 secs is still close to a minute,
and 13*4.61=59.93 is even closer than the current 12*5.01=60.12
(with exponents EXP_x adjusted to a ratio of 13 instead of 12).
finish applying the LOAD_FREQ (4*HZ+61) avoids loadavg Moire patch from http://ripke.com/loadavg/moire

Conflicts:
	include/linux/sched.h
timers: Avoid finding cpu for migration of running timers in __mod_timer()

Currently we don't support migration of currently running timers. Current code
flow in __mod_timer() is:
- Find a cpu where we should migrate the timer
- Check if timer is currently running
- If yes, don't migrate.

In this process, the first step is a unnecessary activiy, if the timer is
currently running. This patch tries to avoid it in such cases.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
backported from Linux 3.5+ by faux123
- edit record
- implements Parcelable
Hide a pomodoro timer link.
Changed test database entries
Merge branch 'master' of github.com:vpai/maplight-169
Compatibility for BeautifulSoup 3 and 4

BeautifulSoup4 is imported by default if present.
allow services to download an extract zip files
added first version of a TvSubtitles service
Merge branch 'develop' of github.com:wackou/subliminal into develop
simplified use of crush.sh
removing `p`
new bunny code
Merge pull request #12 from levymetal/bunny

new bunny code
Gitit: Add Category help to sidebar

In Gitit, you are able to assign a Page to categories.
Just add these sentences to the top of page

    ---
    categories: CategoryA CategoryB
    ...

I forget that again and again, therefore I add this to Help.
Fix renamed variable 'from' in mainloop.cpp
Removed some unused files
Removed some unecessary references to time.h
Removed unecessary references to time.h
Removed unecessary file auto_buffer.hpp
Use wrapper function tvtime instead of gettimeofday
MOD: theme

modified:   hetao_blog.sql
modified:   hetao_blog.sql.bak
modified:   sites/all/themes/kanji/maintenance-page.tpl.php
modified:   sites/all/themes/kanji/page.tpl.php
Fix accuracy/precision
[Change]修改 baidu.regexp.compile的注释
[Change]修改baidu.regexp.compile注释
[demo] add callbacks demo
[demo] 新增 defer demo
Merge pull request #379 from wangxiao/dev

暴露接口callbacks和deferred
Merge pull request #380 from pengzhanlee/dev

defer 和 callback demo 新增
Merge branch 'dev' of https://github.com/BaiduFE/Tangram2 into dev

Conflicts:
	src/baidu/regexp/compile.js
[Change]修改DOM里HTMLString下的length>2
Merge pull request #381 from huangfangrong/dev

Dev
[Change] 发布release文件和修改版本号
Merge pull request #382 from linlingyu/dev

[Change] 发布release文件和修改版本号
修改extend注释
Added config option for Creative Mode protection and added a hack to copy over book information when backing up itemstacks
Added asset directories,
rough sketch of player as an xcf and png.  PNG will suffice for vertical slice 1
add web client link
retirando fixRigthBottom
storage controller fix
[#2119] CS fixes

- trailing whitespace
simple autonomous robot added
Applied JSLint to charts.js 
FYI - still have 8 errors and unused variable
jsLint - not completed
Added tracking of layout found inside the table at two summary vector intersection
Table Summary row and column highlight, header highlight.
Added more Zebra example
Activated the Cell header hover animation
Added support for column highlight and added 4 custom parameter for zebra personalization
removed a console.log instruction
Merge remote-tracking branch 'origin/feature-zebra' into feature-chart-graph
Merge remote-tracking branch 'wxt/master' into feature-chart-graph

Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/pe-ap-min.js
Rebuild
Merge pull request #181 from duboisp/master

Zebra with column highlight and data summary
JSLinted some JavaScript files. Updated working examples pages with new Zebra striping working examples.
added host cache
Agregada unión entre los jefes de cuadrilla y trabajadores a través de su rut, además agregada funcionalidad para ver usuarios del sistema
dateTimeArray formatting
fix force encoding
handle when there is no ads nor keywords in the views
Merge branch 'master' of github.com:wspyder/ad_engine
Fix for issue #42
Merge branch 'master' of https://github.com/jHoldroyd/FireSALE
General fixes and for issue #50
Initial dev commit
Base of PayPal checkout button
Cleaned up product creation page
Admin redesign
Fixed order creation issue
Order fixes and continued redesign
Added comments to helper
Missing table added and instructions to product creation
Language fix for instructions
Fixed the @jHoldroyd commit screw up
Removed PayPal checkout driver. Not needed.
Adding currency code setting

Adding currency code setting and upgrade logic
Merge remote-tracking branch 'remotes/origin/development'

Conflicts:
	firesale/controllers/admin_gateways.php
	firesale/controllers/front_cart.php
	firesale/libraries/gateways.php
	firesale/libraries/merchant.php
	firesale/models/products_m.php
Overloading the stock CodeIgniter cart class

Adding the fs_cart library which will soon contain some extended
functionality to the stock CodeIgniter cart class... without adding any
files to the PyroCMS core!
Final fixes to mistaken commit. Closes #56

Final fixes to @jHoldroyd's mistaken commit.
.gitignore now ignores files we may actually use
Removed .gitattributes file which is not needed
Adding status message when cursor is in error region; only bad condition is when "going to" a selection in the popup.
optim gitignore
Corrected the last of the NPE errors I could find.
reduce tag number
some tiny codestyle changes
now truly added player+leaderboard
Merge branch 'master' of https://github.com/xcabbage/trololus

Conflicts:
	bin/game/core/Player.class
pacos kot weg räumen
pre release
Merge branch 'master' of github.com:xiaomen/selfstudy
webui: set the file extension for snippets downloads
GroupFiles added
pe3 fixed
idiomatic refactoring i hope
some more implementation
Merge branch 'master' of github.com:yairlev/buzz_dart
Updated feature/non-feature/refs in README
added stuff
added dist
add dists again
added currency and date formats and some more translations
Close GH-63: File collision menu, tests for individual generators, mocha:generator and better looking output. Fixes #38, Fixes #48, Fixes #58
Hello, public page
Support view (all) board via public url
Support specifying whether a board is public available.
Fix the issue of not rendering IsPublic in new-or-board.html.
vundle導入
edit
Vowel decode optimization
release 3.2
ipad scrolling fix
Merge branch 'master' into develop

Conflicts:
	select2.css
	select2.js
Merge branch 'master' of https://github.com/yourilima/select2
bash PS1 color
API documentation has been added. Methods have been sorted by name.
Dependencies -> to Parents and Children. Part 1.
API documentation has been clarified.
kobuki_driver : split from kobuki_node, though it still uses ros.
minor
removed old overlay
moved async task class inside PathManager
change onPostExecute - not finished
several asynctask threads running in parralel and all is ok))
removed RouteOverlay
Merge branch 'async_task_branch' of https://github.com/yunikkk/gps-tests into origin/async_task_branch
all markers are numbered
markers moving smoothly, added edittext and button to add route dest
code refactoring, started to divide routeoverlay and pathmanager responsibilities
geoserviceclient hierarchy added
set up class hierarchy of geoservices according slightly modified strategy pattern
edit last commit
Added PreferenceActivity to change geoservices. Working maps.by geocoder.
completely transferred geo service clients logic into strategy-like hierarchy.
refactored according PMD and Lint rules. some minor refactorings.
jaclyn first writing on github
test test test
Merge branch 'master' of https://github.com/zeOxx/StudentGame

Conflicts:
	Perihelion/Perihelion/Camera.cs
[Form] MultiCheckbox/Radio view helper - overrideable attributes per option
Merge remote-tracking branch 'cgmartin/form-multicheckbox-option-attribs'
[Soap] Fix documentation
Merge branch 'patch-1' of https://github.com/Maks3w/zf2 into hotfix/soap-docs
Fix passing of tags to docblock generator class
Change test method name
Merge branch 'hotfix/3213'

Close #3213
Merge branch 'hotfix/docblock-generator-tags' of git://github.com/neeckeloo/zf2 into hotfix/3214

Conflicts:
	library/Zend/Code/Generator/DocBlockGenerator.php
Merge branch 'hotfix/3214' into develop

Forward port #3214
更改数据库配置
增加配置
增加测试文件
adding jsconfar event and blogpost
Site updated at 2012-09-25 09:16:18 UTC
clawler done, ui almost ok
Testing github's header linking
Cruft Removal (backwash, 4chan+, 4chan4chrome)
Add test picking
Add step argument to getPickedBlock() function
Add test picking
Auth updates

- Try SHA1 before MD5
- Check master DB if auth fails on slave, in case slave is behind
- Fix authentication for email address usernames with different associated addresses
changed system for days of weeks
完善读书采集，增加了类型判断和随机采集一条数据
ff
done with layout
done with layout
Pulse icon.
Add big SF/NY images to show on hover in place of logo
Add help to create and switch branches
Version bump to work with repa-3.1.1

Update repa build depenency version to 3.1.1.

Signed-off-by: 8c6794b6 <8c6794b6@gmail.com>
Update notes for submitted changes

* Create method for overriding LOCAL_MODULE
remove DSPManager to allow MusicFX to be default
Praktikum 20121108
completed RTPpacket Constructor, now using proper port in Client
Added luac

When compiling lua files are compiled to engine.luac, whitch is loaded by transport.exe.
You can still change parameters from command line by adding arguments.
FluidLogic http://www.adam-bien.com/roller/abien/entry/how_to_use_scripting_with added to filter "suspicious" Snapshots
Snapshot attributes made available for scripting via getters
Initial creation of comet escalator
Merge branch 'master' of https://github.com/AdamBien/lightfish
removing redundant modules declaration in exporting. cleaned up cake convert task
Added arm-cortex_a8 64 bit toolchain, built with crosstool-ng
refactored..add new tests/methods.
added more tests. some fixes.
check spelling
minor fixes
asked to commit
Merge branch 'master' of github.com:AmanziTel/awe-core

Conflicts:
	org.amanzi.awe.treeview/src/org/amanzi/awe/views/treeview/provider/impl/AbstractContentProvider.java
Merge branch 'master' of github.com:AmanziTel/awe-core

Conflicts:
	org.amanzi.awe.feature/feature.xml
aptget script
...
Move datadir to ~/.rtags
Autoselect when making
Take dot into account when looking for base class.
First packages.json
Move Partial and PartialLoop to Helpers from View class
Added redirect application Helper/redirect.php
Removed old merge artifacts
changed cbot into mybot
attendance 97% done
soopa commit.
Add Vincent Untz to AUTHORS

Several of my patches are in already.

Change-Id: I0b96f4d262205346e112ec8ac23dd7d5a0f252dd
Use right service name when stopping tgt in unstack.sh

On non-deb systems, 'tgt' is 'tgtd'.

Change-Id: I357b47cf117a5e615eb4af9603b7c5670e5cff1c
Merge "Add Vincent Untz to AUTHORS"
Merge "Use right service name when stopping tgt in unstack.sh"
Update gen.cxx (cmd line parameters)
gitignore + remove .idea .iml
gitignore
gitattribute
line end?
Fix not needed anymore, has been pushed in the mainstream.
Changing to PLUGIN for the Teleport.
Some Change to have a better handling of Fly. See #145
RotateAnimation add
Bacteria now hunt food properly
[x11-drivers/nvidia] new purposes
Fixed problem with seeded.
Fixed up searching for (and trait generation)
Pagina inicial y dde ofetas terminada
estadistica modificada
Redactados los partials
Update information
Minor Changes
Merge branch 'master' of github.com:CPSC585/RacingGame

Added powerup spawn locations...

Conflicts:
	CPSC585/CPSC585/src/EntityManager.cpp
Merge branch 'master' of github.com:CPSC585/RacingGame
youtube added
youtube added
more restrictive css and bootstrap bug with close dom elements
isbaselayer and isbaselayeradded functions improved
FlipCommand: setBitmap instead of resetBitmap supports undo/redo
Merge remote-tracking branch 'origin/master' into design_implementation
Merge branch 'design_implementation' of https://github.com/Catrobat/Paintroid.git into 7.59_preferences_enable_tools
missing files
Support for parsing transaction email
Removed gem binary
Added top of building.
usb: gadget: composite: Fix corruption when changing configuration

Remove the config from the configs list before releasing the spinlock.
Otherwise the other cpu might be processing a SET_CONFIGURATION that
will switch to the configuration that is being released.

Bug: 6521576
Change-Id: Id4da0d0e18ead63e20cb236cd1d3e8e6d116acce
Signed-off-by: Benoit Goby <benoit@android.com>
net: wireless: bcmdhd: Fix WPS PBC overlap failure

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge branch 'android-3.0' into android-omap-3.0
Build 3

Fixed Physics with makeCube()
Right clicking removes cubes
Tab toggles Debug mode
Removing Casbah dependency from Java API.
Table 'users' is created
Removed duplicate parameter description from method comment
Changed streaming URL.
Reverted back to ARC version of sprhawk's branch. There was some weird packet glitching that I couldn't figure out which was causing choppy nasty-sounding playback.
Add __bridge and remove legacy release/autorelease in Shoutcast metadata code.
Moved navbar html into base html file
idented navbar properly and removed whitespace line
Fixed link to homepage
Added link to services
Merge pull request #11 from b-ryan/persist_navbar

Persist top navbar across site
resolve merge conflicts from #11 navbar persistence & sticky footer
commit the loadtime page
Define content_encoding
Some fixes for the Coren Direbrew script.
Added JEFRi Context ctxt tests.
Added Entity -> Context relationship.
Brought up to date.
Variety of bug fixes.
moved old readme to storage/docs/ folder.
[html template] link-hover can't just assume fg=black
add 'mmboxgrep'; better document similar aliases
add "trm" for tmux, to parallel "srm"
Added simple test code and did a lot of debugging for match_rooms
Move_Samples v0.21
Removed needless user file
Added Open Image button behaviour
Generated the user model
Make a basic User model (including secure passwords)
Add getHash() function
update the blog about my pc in new SSD X100
move Silverlight file to new location
Add github sidebar to all page and post
Add original favicon from eric.cloud-mes.com
fixing count()
Adding instructions to the readme.
Fix packaging typo

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Update README
Merge branch '1.4' into Collage
Create Coolduino.ino
Build to trigger deploy
clarify new fixtures
Added kill messages for melee kills
Fixes Sem_timedwait on MAC OSX

Detail:

* adds sem_timedwait implementation
* only used on __APPLE__ systems
Only use XPC connections on >= 10.8

- Correctly uses __MAC_OS_X_VERSION_MAX_ALLOWED to only compile
  xpc related code on 10.8 upwards
- Adds the use of properties again which were removed before
  __MAC_OS_X_VERSION_MAX_ALLOWED was known.
- Sandbox check on OS X < 10.8 always returns false, even in the case
  it might in fact run in a sandbox (should not happen.)
EG outline Update

Note to translation section.
Add phposm class to handle the api
Fixing an issue with boxes in custom sub directories
another go at gyarados
XGAppearance
Final object editor
doesnt crash, output is nonsense
get post message when login.
first version of down load.
modified down load.
Merge branch 'master' of https://github.com/HUSTDAVID/wuhan-dm
add down load but still have some problem.
add more reply and change onClick on the button see more reply
Merge IronPyCrypto into source. Only RSA tested
Added ant build.xml
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from ggp0647/master

Added ant file...
Do not expect non-combat ships to do combat.
Do not close the window "Are you sure you would like to decline this mission" say yes to it...
repair item fixes.... the fact that CPP has 2 different windows to confirm the repair quote is very confusing
Solved foreman server output appearing on command line

It relies on the server log containing everything?

Would be nice to chdir to a safe place as well!
remove debug
tweaks to height(made % not px value)
Added News button to pull articles from school websites. CSS and layout of article still required
Update 04-12-2012 17:45

Normale prijs moest nog worden verwijderd.
[tests] check for section(:bottom => -1) senario
Site updated at 2012-07-17 14:55:50 UTC
add string_util.hpp to vcproject file

Signed-off-by: Jack <jack.wgm@gmail.com>
Added a SEViewController category

This avoids that the presented controllers must be subclasses of SEViewController. fixes #10
Fixed the format of test cases, broken when I started upgrading the library.
Fixed the existing unit tests so they pass correctly.
Included json parser cajun
Implemented basic config loading
progress on db model and add endpoint
added simple example for screwdriver
Dnsmasq Cookbook now also sets up OpenDNS
projects updated for 7.1
Added pointer to tests.
updated button on home page to route to new problem
Upgraded project to Unity 4
performance tests
more performance tests also one Thread.currentThread() call only
move xflash out of src
Update "imagePreviewer" component.
Add support for "Umbra" package "adding" components.
complete and tested microposts
Add source files and update readme
Added code to dynamically resize the user's input to match the trainer set's size.  This means the player has more freedom on where to draw the character, as well as size
Merge branch 'master' of github.com:Ktwu/gcs-sun-magic
Enabled the vowel level.
added function to format phone numbers prettily
added store list (ripped from roster's store list)
store list in roster and main store list share the same view.
removed redundant views
added employee editing support
fixed bug where delete store link wouldn't appear
added 'edit' support to shared store list view.
added basic breadcrumb support
changed breadcrumb attributes and positioning
Translated 100%.
Merge pull request #2 from szymbar15/patch-3

Translated 100%.
add original link
translate Collection-constructor
translate collection.models
translate collections.toJSON()
fix some
debut formulaire dependance
Added jabber pluggin, can't do ssl conneciton yet though.
Updated the install.sh file.
Added sitemap.xml route (begining)
CS changes on pull request
Ver. 0.7 from 2012-07-12 10:48:01. First completely working version
general: added uniqueObjExists function
general: changed MayaNodeError message to mention uniqueness
If the proxy is unset then you cannot set http_proxy in the environment
or it breaks pip completely and the virtualenv fails.
wrote some tests for models
additional tests for voting model
somehow missed this from last commit - cancelRequestAnimationFrame
x11-wm/enlightenment: Add files/patch-config.h.in
MGR coupled EnergyBat
Merge branch 'master' of github.com:Maigre/EnergyWatch
Better behavior of sf::Event::Resized on Windows
Merge pull request #249 from kimci86/master

Fix behavior of sf::Event::Resized on Windows
Minor corrections in the documentation of FindSFML.cmake (components order)
Minor correction in comments
Texture::bind no longer crashes when the texture is invalid
Fixed TextEntered event on Mac OS X (Close #192)
Substituted tabulations with spaces and fixed an issue similar to #233
Improved Xcode templates and the readme (Close #224)
Added a sf::Key::Unknown key code for unsupported keys
Merge branch 'master' of github.com:LaurentGomila/SFML
Minor correction in API documentation
Fixed Xcode templates script
Corrections in API documentation
Shape::setOutlineThickness now allows negative values
Corrections in API documentation
Changed Transformable::setRotation so that the angle is always in [0 .. 360]
Corrections in API documentation
Fixed sf::Keyboard on Mac OS X
Improved Xcode templates
Added StartsWith/EndsWith guards.
Added null checks to the comparison guards.
Some resize things.
File > New works COMPLETELY, pretty cool.  Lockout options improved slightly.  Windows now launch in a location given to them by operating system.  File > Load Event File will only look for files with extention .frc by defualt.
Les admins apparaissent désormais en couleur
versie pagina toegevoegd, fix build file
- fixed double worlds on import
RowLog shard scanning: use stop-row instead of prefixfilter to stop the scanning.

With prefix filter, the scan would still open on the next region, just to see there is nothing interesting there. This avoids an unnecessary (but lightweight) HBase RPC call & opening of a new scanner.
Merge branch 'master' of github.com:NGDATA/lilyproject
Tasks cancel improvements
more valgrind and O3
Updatest test cases
first commit
Merge https://github.com/Nathan2000/asi2012
Dispenser and code cleanup
Merge pull request #14 from stevommmm/master

Dispensers and comments
added area calculation to the main function
Update NRGramKit/NRGramKit.m
Some improvements, completed SPI initialization sequence.
Repstrap printer Magic carpet added
Adding tests for configuration object (also to ensure defaults for BC break early discovery)
transforms.registerRequireJsConfig: Note the 'shim' config in assetGraph.requireJsConfig.shim.
Moved most of the getModuleName code from transforms.bundleRequireJs to assetGraph.requireJsConfig.getModuleName (installed by transforms.registerRequireJsConfig).
Hacked in support for require.config({shim: ...}). Needs cleanup.
upgrade PhpVersionError
Added textures, basic ambient lighting, fog and started on skybox.
Core/Commands: Revamped disable command for mmap.
remove useless pathfinding code.
Setting up basic layout and adding initial files
Basic functionality for BitPad
Working on converting BitPad.js into a jQuery Widget
Convert to jQuery Widget
Workup an interface for the editor
Make Bitpad responsive
Add gallery
Delete
Fixing some things
fixing
compile
Add demo page and other shit
readme
Fixed rest error with isset uri index 1
Add Facing text on chatview
Bug: cannot sent emotion directly but can type emotion symbol directly
(ex. [/35])
It perhaps due to target of appendString method is wrong
(line 157 at FaceViewController.m)
Add menu item for closing sub group

Add text to show access key
Make proper indent inside XML files

Convert all tabs to spaces (2 spaces indent)
Add function for closing sub tree

Tested
Merge pull request #8 from PikachuEXE/close-sub-group

Close sub group
Revert "Fixed foreach loop on session IDs, was breaking EP on single session in cookie."

This reverts commit 443a71bc9ce33b150fbfd06332a20b072250c24e.

	modified:   src/node/db/SecurityManager.js
Fix async.forEach in MultiSession code
Merge pull request #1015 from marcelklehr/fix/multiSession-foreach

Fix async.forEach in MultiSession code
Add some awesome jquery scrolling feature.
Add mobile nav.
Version bump to 0.1.1
Ensure explicit nil values are configurable, yo
utility dump view
SQL Statements - also full documentation and fixed methods.
Signed-off-by:Jakob Hansen <Jakob Hansen@192.168.223.39>
Merge branch 'master' of https://github.com/ProperFish/MyTunes.git
Fixed a bug when going to /report without submitting a report (reloading
the page, for example).
Moved add_answer to PDO and added error handling for the situation where
a question has no answers in the database.
Admin page shows the sucess rate of a question
Some changes, doesn' work on this comp though :/
Added a map to the area of interest page
option to play single game
fixed type check in wait(seconds) using isinstance()

using __builtin__.type() does not work in all cases
Инициализация проекта для многопоточного расчета простых чисел
add gitmodules file
working
fix overwrite
el ultimo
Merge branch 'master' of https://github.com/RickyGS/POO---RRHH

Conflicts:
	Optimus/build/classes/controladoras/Admbitacora.class
	Optimus/nbproject/private/private.properties
replaced array with object
Codigo Finalizado en su version basica
Finalizado
Finalizado
fixed deleteAlbum: no longer says failed deletion when actually succeeded
Merge pull request #134 from asocha/master

fixed album deletion, no longer says it failed on success
Updated: STUFF
fix $.fn.offset BUG!
目录大调整
job
Merge branch 'master' of https://github.com/S3baso/TradeFinder
now name complete actually works
Fixed error where the root page was showing ".." as an option.
Added support for figuring out which commit is the latest.

Also added it in the webui under Current Commit. Maybe I should change
that to latest commit.
Added a check to make sure the SHA is at least 10 characters long.

If it's 10 characters or longer it'll cut it down to 10 characters.
If it's less than 10 characters for some bizarre reason then it'll
just return the full SHA.
Added support for getting the total number of commits.

Also displays it on the webui now.
Bug Fixes

NewPedestalCommand:
* Changed the usage string so it shows the command and needed args. I
havent made a getDescription() method for commands.
* Fixed a IndexOutOfBounds Exception because onCommand didnt check the
number of args.
Quest:
* Removed the try-catch as it is not needed. Exceptions flow up through
the stack until they are handled
+ Added a check that the quest name is not empty
+ Added the makeSafeQuestName() static method to get rid of invalid
chars

BlankQuestPedestal:
* Made sure the quest id was being set
* Changed from getQuestName() to QuestID for most things, getQuestName()
is for human readable output, QuestID is for internal use
+ Allows updating existing quests now
* Removes the template book on success

PedestalBase:
* Changed it so that the event handlers wont be called after onRemove()
has been called since you cant deregister event listeners :(
+ Added back in that distance check in onPlayerInteract, it makes sure
that that player interact event is actually for this pedestal.
+ Added a world check to stop bug

Pedestals:
* Fixed removePedestal() not being able to remove the pedestals (lol)
+ Added a debug output to display each pedestal being loaded
Fix:import with coma in amount. Improvment:green line for positive
Fix:import
installed bootstrap and added some styling
corrected error language on user's form
added user selection to subnav
changed styling on user table
added styling to level table
added some layout changes to levels and, user logout
added the correct items on subnav
added some layout to the account information at top right
Modified the Prize model
add sharp media engine
Changing port used by django runserver script
enqueue main content?
registered two sidebars
ISE 14.1 first test build for ML605, v5 and v6 lib rebuild
Fix error in the documentation that Dil didn't like
Figure out the security bit
Comment out _formatXMLError.

Undefined. pylint please.
Revert "Comment out _formatXMLError."

This reverts commit 5f90be479f2833ab26e21651d928deda085ba057.
Define the list of core BT5 to upgrade.
Pass kwargs in a way alarm can understand.
Simplest possible schema validation test.
Litte more logic on schema validation.
signups work
15453

Signed-off-by: Sovak <Sovak007@gmail.com>
STX->0x06,port->5555
Changed in FFT
WIP Added test data, csv reader
Atreyee - added rake to Gemfile of scheduler, rather than relying on system wide rake to work
converted reader and writer to use Documents
Solved utf-8 default encoding for Mako
Fixed #10
Merge branch 'master' of github.com:SyrusAkbary/pyjade
changes made through 5-21-12 1:24 am
Merge branch 'master' of https://github.com/bcat/SVDP
treasurer changes: updateFunds, gotoRequest, issueCheck functional;
editCheck, addComment front end done need db support; denyCheck not
functional.
5-21-12 3:00pm
Merge branch 'master' of https://github.com/bcat/SVDP
Merge remote-tracking branch 'kaleb/master'
Merge remote-tracking branch 'bcat/master'
Merge branch 'master' of git://github.com/bcat/SVDP
Merge pull request #35 from Thatoneguy123/master

Fixes for demo
Merge pull request #34 from bcat/master

More updates for Week 9 demo
Merge pull request #36 from kmroggenkamp/master

treasurer 5/21, Changes for Demo
Merge pull request #37 from kurtsiegfried/master

Navbar Changes
Merge remote-tracking branch 'tucker/master'
Fixed document viewing permissions for member and treasuer
new stack

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
updating thumbnail style
Rankings funcionando 100%
Format Codes and delete unuse files.
Update Database

1. Add CommandName and CommandClass for LiveData property, and remove
the CommandID.
2. using CommandName and CommandClass for get Command instead using
Command ID.
Merge branch 'master' of github.com:TremZ/Unvanquished
Scripts/Oculus: Support for Ruby, Emerald and Amber Void achievements

* Remove from disables and add criteria instances scripts
Based on retail data, rest of the dungeon still needs rewrite. This only take care of what the achievement needs. Tested.
Engineering mounts info
check
Basic App Functions
WARNING: backwards-incompatible change to Model::config()
Merge pull request #515 from jails/pr20

WARNING: backwards-incompatible change to Model::config()
just a tweak to a couple comment lines.
Added back getInstance, remove OP wrapper, add in ability to specify if
spawn points should be kept loaded per world (check worlds.yml).

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Human.class not VanillaPlayer.class

Signed-off-by: Windwaker <wjcrouse913@aim.com>
Some more fixes. Fixed up Health all the way up to playing a sound now.
Removed WindowComponent, don't bring it back till its re-written to be
sane.

Also did a slight refactor.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Reactivated the smooth populator and fixed a few things (I still need to find out a way to make it play nice with overhangs), fixed some values for beaches, and reenabled the mountains

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Fixed port issues
Front end needs to be connected, client doesn't update till button is pressed.
Fixed port issues
Front end needs to be connected, client doesn't update till button is pressed.
IE9 fix for inserting br on enter
Finally got it moving like a normal vehicle
gameplay for pg3
Merge remote-tracking branch 'PlayGround/master'
1 to 1 angle control for the rocket
add rtorrent_fast_resume.pl
clean up whitespace in rfr.pl
PORT variables
localize some function variables
Translation fixes, some Swedish translations didn't match the English text
Compile pl0x
Working on parsing a configuration file on startup, the format will
be a stand INI file with basic settings for database etc...
Again with the README…
update addoffer.php, incl styles
Fix PDO bindParam issue, hackish fix for PATH_INFO
C++ Basic Examples
First program
Classes and Objects
Accepting, Displaying and manipulating public data members
Accessing Member Functions
Public Data Members in Classes
Accessibility of Private Data Members in a Class
Using Member Function to Access Private Data Members
Passing Objects as arguments to Member Functions
Arrays of Objects
A simple Constructor and Destructor
More on Constructors and Destructors
Constructor and Destructor with dynamic allocation
Function Overloading
Friend Functions
Merge pull request #2 from OpenVE/master

Update repo
Fixed Fisherman 2
Match goroutine/indepedent populations to CPU count

Also, use channels to stop GA execution
tiny performance improvement.
added documentation.
added checking for pointers.
moved some variables to private.
Header付きListViewを持つDialogを表示しながら画面回転したり、
言語切替した後に復帰すると稀にエラーが発生。

addHeaderViewで、第三引数にfalseを渡した場合に発生。
elements.clearをやめると発生しない。
add a bunch of lines to README so I can force a merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	UIT_harkka/src/LoginCheck.java
	UIT_harkka/src/LoginPanel.java
Lisätty esimerkki scrollaavasta backgroundista. On muuten nätti! Myös korjattu debugdatan päällekkäisyyttä
fixed timetables layout, added loading message
WFS: make GetExtent() (resp. GetFeatureCount()) potentially faster in /vsicurl_streaming/ mode, by reading one feature and then querying the base layer for GetExtent() (resp. GetFeatureCount())

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24454 f0d54148-0727-0410-94bb-9a71ac55c965
Updated svn:ignore property

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24455 f0d54148-0727-0410-94bb-9a71ac55c965
Updated svn:ignore property

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24456 f0d54148-0727-0410-94bb-9a71ac55c965
OSM: even the longitude difference might need 64 bit due to the way signed integers are encoded

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24717 f0d54148-0727-0410-94bb-9a71ac55c965
Merge pull request #155 from abhinavc/master

minor edits 
[cron-git-commit] @ 12.47
[cron-git-commit] @ 13.49
Added boiler plate code to prevent build errors ..

\fig4tex template code was added so that one didn't have to write
\figinit, \figdrawbegin etc everytime. But by themselves, they cause
the build to barf. And hence, we cheat the system by adding a little
non-sensical code just to get the build to run
devel:join
commit
commit
Removed debugmsg
Removed debugmsg
added getstatus fn
Merge pull request #3 from abilng/devel

Devel
Updated TimeOffset & Admin Report
Updated User Agent version number in MainMovieService
Astrodrizzle Tweak
 - imaging/mtpipeline.py
    Updated the make_output_file_dict function to use the new astrodrizzle conf files.
Modules:

display_tools.py
 - Refactored the before_after function to be more concise.
 - Fixed the image labels.

run_astrodrizzle.py
 - removed the dependency on an argparse instance as an input to the main function.

run_cosmics.py
 - Added and assert statement to run_cosmics to ensure the input file exists.

General:

 - I moved all the pytohn files to a subdir called code. I used the `mv` command as discribed in [this] (http://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history) post on SO. I really hope this didn't mess anything up.
 - I created a subdir for the astrodrizzle config files.

Notes:

 - I think run_astrodrizzle.py might could be better laid out. I think main should go under command line execution and run_astrodrizzle should be listed as the main controller.

 - Couldn't completely debug the astrodrizzle function yet because it requires reference files.
added something secret, but fun
created string->symbols
Wizard is now using TextAdventureFrame
Backbone+Require: Fix minor bug
Convert to using Lodash
Adding links to CanJS examples with descriptions
widget a funcionar
some more adaptations
Merge branch '3.0_customized' of github.com:adlanelm/spf13-vim into 3.0_customized

Conflicts:
	.vimrc.bundles.local
	.vimrc.local
Fixed event test on platforms without regions. Refactored tests to use proper setup/teardown
Removing Transforming Tiles sample because texture samplers are not available yet.
test albom
Utils: split trash...
And that, dear children, is why converting text between Windows and anything else is a pain in the ass\!
Bump version: 1.1.2.
moves the invokeAndWait call to setUp
Add 15 way D connector pin out
Don't allow invalid characters in environment variables, replace them with underscores. Also version bump.
deleted
depot
depot
C++ exception backtrace
cleanup
Support multiple patters per rewrite function

e.g., rewrite("Foo(x)", "Bar(x)", function(b) {...b.x...} would match both Foo and Bar
Fix code formattingin readme
Revert "Test commit for dqx-dev"

This reverts commit 0bf9dd2cfafd52e0221a7536919fdeae94a342dd.
fixed server side callback
credit jgs w/ skull
Working on 1n
I need to make this work later.
Added logos to the page