labofsahil/github-event-dataset-2012 huggingface dataset:
core: Change validation groups to inherit default

Validation groups should inherit the default group, since we would
usually want to check the default validations and in addition those
for these validation groups (Create & Update entity).

If no group is specified, the default group is used by the validator.

Change-Id: I0774a4e9e4ea23d99702783291c181118fd2a309
Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
core: look for changes in view and sp files during upgrade (#857029)

https://bugzilla.redhat.com/857029

This fixes upgrade.sh to check for changes in
backend/manager/dbscripts/{create_*views.sql,*_sp.sql} like it
previously did.

Change-Id: I80f3842a5f368868916d9e8251f0bf66674da9bf
Signed-off-by: Greg Padgett <gpadgett@redhat.com>
restapi: Use JBoss JACC artifact

The artifact that we currently use is not available in the Fedora
17 repositories.

Change-Id: I397a9dfb5cc79bfc141013cd3b1153bc1fa365ea
Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
initial commit
Tear out a bunch of content that makes sense for the responsive-template but not for the game bootsrap
Added a default title
Remove unused icons
Merge remote-tracking branch 'dmose/master'
More gutting.
More refactoring.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'ack/master'
Removed incorrect comment and unnecessary </link> tag; r=paired with ack
Landed qunit 1.5.0 in tools dir
Landed node version of qunit 0.5.1
quick change in filename
Auto-orient photos
Revert "I edited the comments"

This reverts commit dc31d06b4d90af90f299666f8c31f248185292cd.
Revert "Revert "I edited the comments""

This reverts commit 9ea30f3b871bbaf315c8aa238e84cfaa1870fdb6.
Revert "Revert "Revert "I edited the comments"""

This reverts commit ee42d8e79bbe1ebc3de94dd12d26f9f2e20ad922.
Revert "Revert "I edited the comments""

This reverts commit 9ea30f3b871bbaf315c8aa238e84cfaa1870fdb6.
Revert "I edited the comments"

This reverts commit dc31d06b4d90af90f299666f8c31f248185292cd.
Revert "Update README.rtf"

This reverts commit de3313e93f55ea370deafa727d1aaa801c6036b5.
Bump application version to 1.2.4.
Don't need all these files anymore... coding it to use a GET request to determin the category of browsing.
Converting over to the book style... Getting there.
minor fomatting and link fixes
Added new logos. Clean removes test-docs folder.
troca do index.html da home
Documentação do back do pmc
Merge pull request #366 from jamilatta/master

Documentando back do ref tag
Adicionado a tag ref na documentação do XML Scielo
Adicionado o json da tag ref tipo journal
Merge pull request #368 from jamilatta/master

Adicionado JSON na documentação do ref tipo Journal
Corrigindo comportamento do botão cancelar dos forms
Ajuste no grupo de usuário bibliotecário, para visualização de lista de formulários em versão draft
Merge pull request #369 from fabiobatalha/tk365_cancelbutton

Corrigindo comportamento do botão cancelar dos forms
Merge pull request #370 from fabiobatalha/tk376

Ajuste no grupo de usuário bibliotecário, para visualização de lista de formulários em versão draft
Merge branch 'master' into articles
Infra inicial para geração de índices no MongoDB
ajustes em janela de manutenção
Novos ajustes para garantir que apenas 1 evento tenha capacidade de blocar o sistema
Removendo metodo get_default_by_user
Adicionando automaticamente mais alguns tipos de referências da SciELO
Merge pull request #371 from fabiobatalha/maintenance_improvement

ajustes em janela de manutenção
Corrigida vulnerabilidade no código das seções
Merge remote-tracking branch 'fabio/tk354' into rev-fabio
Merge pull request #373 from jamilatta/master

Adicionando automaticamente mais alguns tipos de referências da SciELO
Ajuste na colorização dos blocos de código/texto
add run script, simulator is working now
2012/06/15_kamo_create
Fixups for django versions and rh/fedora fixups functionalizing
Comments and string cleanups
Comments and string cleanups
Allow packager to state when a package was already installed, make pip use the common base class and audit adjustments in shell logging. Fixing up to be in sync (again).
Merge branch 'master' of github.com:harlowja/Openstack-DevstackPy
General guidelines update: Link to Thoughtbot's article "What is good code?".
fixed review attribution bug
add lec18
add lec 19 into lec 18
add UGent in copyright header
Merge pull request #15 from boegel/copyright_UGent

add UGent in copyright header
Also disable send_arp_for_ha when multi_host is false.
format
new translation
Merge branch 'master' of git://github.com/ibrows/IbrowsNewsletterBundle
so no iframes, no form-buttons, and no bookmarklets
so there are now only links..
PHP 5.4 compatability. fixes #57
Add old static site
Sync

Signed-off-by: Conrad <conrad.fuhrman@gmail.com>
Corrected form error outputs for user form.
Fix viewport mobile
Merge branch 'master' of https://github.com/ipfix/theexperimentalcalendar
Also fix up vectorSimilarities.py
added countries to scare people in
Added more questions to the faq and increased the top margin of teh faq section in teh global css.
Grails on OpenShift with Tomcat
Prep 3.2.13.GA
Next is 3.2.14.GA
fixed flash api
Copypasted from lecture.
HW4 BDD+TDD part 2 final
vkb
vkb
Optimisation: Caching in the sizeThatFits method
Correção da tela de listagem de answers
Additional Description
Avoid temporary variables and semicolons where possible
Fix where scope in order to use let method in where blocks

- Create ExampleGroup instance for evaluate where block.
- Get parameters from instance.instance_eval
Improves development setup

1. Add grunt as a depdendency
2. Sets up jshint linting + uglify minification through grunt
3. Adds a section in README on development guidelines
Fixes bad practice javascript code

* Replaces == with ===
* Fixes unneeded semicolons and adds missing ones
* Radix param to parseInt
* Duplicate var statements for the same variable
Merge pull request #51 from nervetattoo/master

Make development / contributing easier
Fixed branch to build with sbt 0.11.3
modif copier coller
LPS-27836 Add roles elements checking
LPS-27836 Modified hashCode() to avoid NullPointerExceptions on adding RoleRecipient object to Notification object's Set of RoleRecipients
LPS-27836 Source formatting
LPS-27836 Take care of proper roleType setting
LPS-27829
LPS-27898
LPS-27898
LPS-27829 - Refactor the Liferay.Service calls in plugins to use the new JSONWS API
LPS-27829 - Source formatting
SOS-992 Fixing issue with Events Display Portlet Permissions config in Portal
SOS-1081
SOS-1089: SOS-1080 Fixing misaligned add sites buttons
SOS-1087 Fixing long site names in contact center.
SOS-1089 source formatting
SOS-1089: SOS-1080 Language keys
LPS-27782
LPS-27741 Update dependencies on test-pacl-portlet
hapus tulisan NIP.
Added testimonials, renamed popular to favorite (element).
try to fix default value issue
fix default value issue
Updating to lift 2.5-M1.
Updating API. Simple demo of Bootstrap Nav. menu generation (inc.
sub.menu dropdown) from Lift menu via snippet.
Minor scroll spy tweaks + adding missing api doc file.
Add two new jQuery plugins: Lazy Load and Sisyphus
bug fix for Linux.
Comments work - Needs styling.
OMAP: clock: fix race in disable all clocks

clk_disable_unused is invoked when CONFIG_OMAP_RESET_CLOCKS=y.
Since clk_disable_unused is called as lateinitcall, there can
be more than a few workqueues executing off secondary CPU(s).
The current code does the following:
a) checks if clk is unused
b) holds lock
c) disables clk
d) unlocks

Between (a) and (b) being executed on CPU0, It is possible to
have a driver executing on CPU1 which could do a get_sync->clk_get
(and increase the use_count) of the clock which was just about
to be disabled by clk_disable_unused.

We ensure instead that the entire list traversal is protected by
the lock allowing for parent child clock traversal which could be
potentially be done by runtime operations to be safe as well.

Change-Id: Iea5201233d89b8417576df4ed9026e1c05001596
Reported-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
pm: cpufreq: boost cpu frequency API support

This patch introduces boost sysfs interface which would enable the
govenor to ack any request for running the system at max freq just before
the system is going to be loaded. The next sample time would be decided
based on the user configured timeout value or the default (0) usec.

To set boost timeout:
echo <in usec> > /sys/devices/system/cpu/cpufreq/interactive/boost_timeout

To enable boost:
echo 1 > /sys/devices/system/cpu/cpu0/cpufreq/boost_cpufreq

Change-Id: I06840c1b27ecef326f48c24d37be452fdf65a001
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Turn off audio debug
[maven-release-plugin] prepare release kiji-common-flags-1.0.6
bundle update and hg3p1
Use delete-frame-functions hook to switch on/off

Note that this hook cannot be added/removed in
e2wm:pst-minor-mode-disable/enable-frame like other
hooks as it is needed to be active in the deleted frame.

Fixes #34
e2wm:delete-frame-functions works with emacsclient now
Removed emacs auto save things
上部に固定表示
Added Pool Timeout and Poolsize options to PooledRedisClientManager
Flash red when hit by an enemy
Add more leaves to the forest level
Change how costumes are selected.

Gone is the 'More Options' screen. To select a costume for a character,
hit tab when they are selected. You'll see a preview of the character
along with its name.
Remove old character selection screen
Add web sprite
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey
Fullscreen is now off by default
README
Removed default rails README.rdoc
Merge branch 'master' into no-leak
Typo in Opcode Table...sorry
Adjusted emoticon font size
loader has moved to the bridge in SF2.1
Merge pull request #56 from instaclick/loader-patch

loader has moved to the bridge in SF2.1
Splash Screen

Splash Screen now displays logo on a stary background.
Next Job:
 - Adding Menu
 - Start Button
 - Options
Removing internal gemserver reference.
Move build and publish tools to tools/ folder
added notifications, small tweaks to travis.xml
Adding of more background from freegreatcapture.com
fix: little bug with the includes which prevented $fieldsprefix and $svsdelimiter from being loaded

Signed-off-by: Stephen L. <lrq3000@gmail.com>
disable non production code
brand in page title,
no footer on contact page,
remove css/images from securesocial
Merge branch 'master' of github.com:lukasz-budnik/hackaton-portal

Conflicts:
	conf/routes
1
1
fix messages.pl
template for start
template for the start
Database sessions are now using the new query builder
removed signing key
Update src/Acme/TestBundle/Entity/Entity.php
Initialized the first files
Merge branch 'master' of https://github.com/martijnreening/nexus-vanadium
Some more help file cleanup
Complete rewrite of the compareClusters function - not only is it many times faster (i.e. computes in minutes instead of days) but also it gives results in a more intuitive and more consistent format
Improved some comments
Add addressfield module
renaming
Merge branch 'master' of github.com:maxstauss/statamic-foundation

Conflicts:
	README.md
Add artist_ipi and label_ipi to replication
Add artist_ipi and label_ipi to import and export
added mocha tests
added mocha tests
0.5.0 Release

Updating README
fixed some weird places in script 1
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
added upload-box dialog
Merge branch 'beta1' of github.com:mindpin-shcmusic/pin-2012-edu into beta1

Conflicts:
	pin-edu-sns/app/assets/stylesheets/application.scss
	pin-edu-sns/app/assets/stylesheets/mindpin-scss/_image.scss
	pin-edu-sns/app/assets/stylesheets/mindpin-scss/_search.scss
Removed unused USING_APP_ICONS define.
Updated description to reflect the fact that app icons are no longer downloaded preemptively.
[#CB-1154] Fix error while generating the documentation.

The problem was that a hash (#) was used in a h1.
The fix was easy, since all of the h1 titles should
have been h2 to begin with.
Fix Markdown formatting of Windows Phone Plugin Guide.
Updating reference
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-docs
[CB-1170] Update Upgrading Guide for ARC migration
[CB-1171] Update CordovaWebView Guide for 2.1
[CB-1172] Update Upgrading Guide for 2.0.0 for missing steps
Added Terminate function
bug 809395 partner updates for aol. r=bhearsum
Parece que faltaban unos elementos
Stimmen 2009 generieren
Added launchpad example
Add changeDataDeleted operation
Changed API and started Replace functionality
fixed build
Merge branch 'master' of https://github.com/mvdenk/JavaProgrammingContest
Admin stylesheet produced by compass after ecd16d235924f9374dbd28890fd27e504e43a46f.
Moved inet_pton6() and inet_ntop6() to common.common. Modified the __all__ value of common.common, for the convinience of 'from common.common import *'
Modified the error definition of variables in Honeypot class. Fixed a litttle implementation bug in SLAAC.
Wordpress Version

25 Aug with latest CSS updates as confirmed by InOPEN
Merge branch 'master' of https://github.com/nayansuthar365/inOpen-website
separate tracker
adding two breakpoints to license provider
Note new maintainer
Fix error in sending lattices over channels.

(1) Embedded lattices must be fields of a tuple, not nested inside arrays inside
    the tuple

(2) Embedded lattices cannot be key fields, so we need to change the `mcast`
    channel to have a non-key field.
Load lfixed in server program.

Needed to serialize/deserialize messages document state update messages.
Add index to testid
adding vertical scroll view
Commented and added join loop
bold For the MML layer setup
add absentee
ofVboMesh: fix clearing of vbo buffers when mesh is reallocated to 0 + fix enable/disable of buffers
Fixing image simpleMarshal for imgs without pixels (see #9643)
Merge pull request #378 from cneves/tickets/9643

Fixing image simpleMarshal for imgs without pixels (see #9643)
Removed misplaced via and disconnected MAX3051 shutdown pin
Update notes for submitted changes

* Remove the openstack-ci update.
Update notes for submitted changes

* Add generic jenkins jobs
with a valid database connection
with a valid database connection
added ajax functionality to show pages
re arranged the asserts
with fully add project and scroller
with some fail safe fixes
delete project feature
with compleate projects page
with start task
Fixes #9, #10

Go back to the bus icon for the notification tray, and a special dark
icon for the arrivals screen.
Suppress warnings

We're going to live with this deprecated interface for a while.
Fixes #11, #35

This was just hardcoding colors that shouldn't have been hardcoded.
Build has moved to http://github.com/webos-internals/build
Fixes bug (not tested): Would create two directories called "framework": /usr/palm/frameworks/enyo/0.10/framework/framework/... instead of just /usr/palm/frameworks/enyo/0.10/framework

There probably needs to be some sort of update mechanism to fix currently installed packages as well.
build/linux/enyo/Makefile: changed version to 1.0.1
/build/linux/enyo/Makefile: added changelog for v1.0.1
Update Save Restore to 1.6.1
Merge pull request #6 from Audemars02/master

SaveRestore to 1.6.1 in beta
homebrew pivot
updates and additions
new patch
new patches
navit: update to r5031.
Merge pull request #7 from noradtux/for-preware

navit: update to r5031.
navit: update to r5031.
new and updated
new patch
updates and additions
updates and addition
update
new patch
Merge branch 'master' of git://github.com/webos-internals/build into for-preware
bug fix i think
test icon
arrow size
Formatting of the example output fixed
Readme and license added
Added Project files as well
Fixed refresh delay.
Merge pull request #1 from hariharsha/patch-1

Fixed refresh delay.
makeconf: new cell (Mettmann) & splitting spaghetti code
- updated to: 1.7.15
- up to 0.6.0
- python support dropped upstream
Also if the parent is DX
cleaned up button code; interrupts work better with 67nF caps
created coarse grained DAO
made some changes in dbprovider to return 
datastore
API呼び出し部、Interprocess呼び出し部以外をほぼ実装
レイアウトフォームを追加
プレビュー領域のドラッグ移動を実装
ドラッグ移動の箇所を修正
ドラッグ移動の問題修正
#6 レイアウトウィンドウの実装
マージミスを修正
操作するプレビューをひとつにした
エラーコードの整理：どこでエラーが起きているか一目で分かるようにした。あとkNoError以外別の問題で共通のエラーコードを使わないようにした。
名前付けを修正
Merge pull request #16 from progre/Layout_form_2

レイアウトウィンドウの実装をマージしました。今の段階だとForm1が出てこないのでそこはすぐ書き換えます。
ぷろぐれさんのコードをマージして、Layoutボタンで表示されるように変えたところまで。ここからがんばって作りこむ！
DragMoverの手直し中。あとGUIを整え注
DragMoverの調整が終わらない！これすごい難しいぞ！思ったよりも！
どうやっても安定しないことが分かったので考え中
ありがとうどこかのハッカー！SendMessageとWM_NCLBUTTONDOWNを使う方法なんて思いつかなかったよ・・・
いろいろ更新中
ディレクトリの整理。プロジェクト規模に対してディレクトリ階層が深すぎた気がしたので。
LayoutFormの大改造中
さらにディレクトリの整理とコメント付け
auto_applyのための若干の拡張
とりあえずプレビュー機能つけた。これでレイアウト機能は最低限使えるはずだ。
fixes #992: simplifies clear_session_user.  works in conjunction with an apache config change: adding RequestHeader unset REMOTE_USER above CoSign directives.  tested on -test instance
Add puppetlabs_spec_helper gem code
Remove git submodule fixtures in place of puppetlabs_spec_helper fixtures behaviour
Add $concat_basedir custom fact variable for spec tests
Merge pull request #1 from hunner/add_spec_helper

Add spec helper
Remove JavaDoc warning, and put "DefaultExceptionHandler:" on logged message.
sqlite para desenvolvimento
First Jasmine tests
Import ui lib from sample dart app
Ready to use the framework
State machine and basic models created
We should name the library correctly
Finalize plan for framework, get starte on converting'
Add some style. More functionality in top bar
login seems to work
Login works. Needs some refactoring
Login working in a more proper mvvm style
Merge pull request #3 from reedlabotz/m-v-vm

Switch to MVVM style app
using hash::merge for some functionality, still leaking
JS: Using subclass instead of Proxy
new configs
after update configs
new flavours
drop a generated file
local patches - mostly synchronous btrfs snapshot removal
add casts needed when compiling with c++ compiler
add experimental arduino example
make prepare script smarter
Drop the extra field from auth hash
working algorithm list, and a basic algorithm.

The simulator is complete.
raytracer seting up
Just DiversityServiceSource
ViewIU Page:
- removed Parent Specimen
added .DS_Store files to ignore list
Added check on list of files

Added check to see whether the list of files contains any files at all
Added default filtering, minor speed improvements

- The filter configuration (/Config/Template/filter) is now taken into
consideration, the default is 'comment, whitespace', filtering out all
comment nodes and insignificant whitespace
- Added '_featureExists' property, speeding up feature detecting
slightly
- fixed several docBlock comments
Minor speed improvement

The internal template data is now build as string (as before) but
converted into a DOMDocument upon duplication (take from the the
internal template once it is created)
Added Readme.txt

Added the Readme file for the project
add plugin fnFilterOnReturn
bump version to 1.11.0
update doc to include fnFilterOnReturn plugin
come on postgres
updated motif2 to return fewer motifs
convert test variable for connection string to use process
don't separate tests dir from plugin dir
make the second circle look less dumb
добавлен загрузчик для плагинов bootstrap
Further fixes #55 App now has a saveChanges() function that updates CouchDB.
updated copy, formatting
added appbuild.js
packet names
packages: Build 201212272303 of shr 20121228 for machine qemuarm on garnet
images: Build 201211191249 of shr 20121119 for machine om-gta02 on garnet
packages: Build 201211191249 of shr 20121119 for machine om-gta02 on garnet
packages: Build 201210220213 of shr 20121022 for machine om-gta02 on h1987041.stratoserver.net
images: Build 201208301138 of shr 20120830 for machine om-gta02 on h1987041.stratoserver.net
packages: Build 201210201638 of shr 20121020 for machine om-gta02 on h1987041.stratoserver.net
packages: Build 201210101426 of shr 20121010 for machine om-gta04 on jama
packages: Build 201209221743 of shr 20120922 for machine nokia900 on opmbuild
Connecting lower caches to the higher level cache structure
Added redhat init scripts
Fix the collection controls selector

Fixes a bug that caused collection rows to be added multiple times to
the DOM. This was caused by the selector selecting all children with the
class .controls, which in turn meant that you couldn't use control
groups in subforms.
fixed ie7 and ie8
Merge pull request #5 from richcode/master

my new update for ie7 & ie8 fixed
Start work on word search solver.
Work on World Cup Prognostication.
added files to test submit to frontdesk
fixing erros, handing errors, fixing css
- edit button as visibility=gone for poi-detail
- changed include name of generated classes to match manifest
added transceiver configuration code
Added Deletfunktions to Table
User profile finish
Merge branch 'master' of https://github.com/sportscontroll/sportscontroll

Conflicts:
	src/de/dhbw/sportcontroll/ui/MainFrame.java
Merge branch 'master' of https://github.com/sportscontroll/sportscontroll
implemented restricted viewing of user e-mail on profile page
#45 fixed typo on line 369
Default removal of Quality tab sitll occurs when the options page is never viewed
another step forward in creating a suggestion
removed non-js example files
removed non-js example files
cleaning up script and added a dump at a natural place in the process
keep working on graphs
removed junk from graphing javascripts
Corrected link to GParted
Some mongodb Log updates. Mostly.
rudymentary RestApi.streamData (will replace streamLog)
polished CHANGES
added missing 'scopeFreshness' definitions
-Wall cleaning
added 'source-dists-tests target to 'Makefile'
added TESLA 1 and 2 case studies

The status is such that TESLA 1 is finished, but TESLA 2 requires more work.
updated regression tests
version bump to 0.8.0.0
mkdir creates a dir with the filename being used afterwards. Removed it.
Merge pull request #1 from rsommer/patch-1

mkdir creates a dir with the filename being used afterwards. Removed it.
adding some better $.ajax defaults to fetchTemplate
Merge pull request #100 from wookiehangover/master

Improved $.ajax options for fetchTemplate()
add travis and composer.json
Setup the project level templates directory by default
Converted to grunt plugin
Throws errors on missing size set, much better image layout.
Hides autocrops.
Fixes issue with copy.copy() on crops.
undo for filtering table
Remoção de arquivos do latex dispensáveis
renaming file to mouseDelay
updated docs to detail pygments lexers rather than filters
Lizard Skin texturing changes

Tweaked texture- Andrea made a tile piece, which I used to craft the
final repeatable png file.
Added editable files to model
add controller spec
add controller spec
ubuntu-drivers: Fix duplicate system modalias debug messages.
UbuntuDrivers/detect.py: Disable two debug messages which cause excessive debug log spew and are not very interesting.
Basic locations list.
Adding jit to octo nemesis scope
Adding gentoo cheats
Merge branch 'master' of github.com:tuxtor/elabismodetux-markdown
initial commit
Merge branch 'master' of https://github.com/tvoglund/BootStrapMongoSample
added subtle grep bug fix
Add PyPy string builder note.
load template tag
create or replace + dash
Test deployment switched to WAR
Using port definitions consistens with led drivers init functions
Some formatting changes
Some formatting changes
integrating ruleset build script
Change config-distro help message
03-07-2012, dunaamika lisanime lopusirgel
removed wmc-common in composer.json
Fix #152
Extracting code for siginging apks so it can be reused for the new resigning functionality
Add canned step for entering text into a field by it's view id
Merge pull request #154 from bootstraponline/pkg_name

Fix #152
Adding entry into canned_steps for newly created enter text step
Added calabash-android resign command
Merge branch 'master' of github.com:calabash/calabash-android
Merge pull request #155 from withoutclass/dev

Add canned step for entering text into a field by it's view id
Fix some iOS XML docs
Fix build conditional constants for iOS build
NetLadioLibForAndroidディレクトリを作成し、ソースコードを移動した
Add link to Geodjango and Leaflet pages in README
CSS red arrow

red arrow is now semi-fixed in position

TOPLINKS ARE BROKEN HOWEVER.
Fixed minor errors

* app breaks when we enter create a project
admin - fix double-load of product in management cats
fixed typos in templates@
Merge branch 'src' of github.com:100Shapes/100shapes.github.com into src
fix the name
fix the name
Latex Documentation
latex input files
First attempt generate resume
Gitignore
Improve transformations
Preserve DOM order
Darker header on news item
make the font link absolute rather than relative
Merge pull request #1 from hippietrail/master

Made font link absolute so it will work from anywhere
Git ignore and adjustment to module
update README file
Changed the README. There was a little mistake.
Resolving a merge error on README.
Refact of the script automated build.
Merge branch 'master' into DEV

Conflicts:
	br.org.archimedes.build/automated-build.sh
Tuning automated build for travis.
no message
no message
Merge branch 'feature/feature1' into develop
added user model. has a lot of functions.
Implement, test, generic_u16/32string.
Changes for network default selection
renew translation. Update ver. to 2.5.18
StatusIndicatorMenuDropDownView fix to working state (nokia left it unfinished)
Added simplecov hooks to RSpec and Cucumber.
Merge pull request #24 from CS169-Raxa/simplecov

Added simplecov hooks to RSpec and Cucumber.
added asm libraries
got rid of old files
Site updated at 2012-12-17 01:48:03 UTC
Update misp/install.plist
[OPENENGSB-2881] started reworking pullrequest critics
[OPENENGSB-2881] moved definitions from UI to API
[OPENENGSB-2881] moved internal services to visible package
[OPENENGSB-2881] changed all Lists to array; reworked pull review
russ adds ALL THE DEPENDENCIES
fix wizard mode startup save-locking bug
Merge branch 'master' of github.com:ComputerScienceHouse/bingehack into locale
Getting rid of 02 increment. No need to sort yet.
Added note about windows support not really working
Added variable for enabling debug mode (verbose error messages).
Added variable for enabling debug mode (verbose error messages).
Revised field size and spacing when generating layout fields.
Started reload link, admin tweaks
Use sqlite as the new backend.

- Switches from .txt based lists to .sqlite based ones.
- Adds a script (scripts/wordlist_converter) to convert between the two.

This change makes the module a lot more reactive (the module generally
reacts in less than a second now, where it took several seconds, sometimes
even a minute, before).

The module now requires both the PDO & PDO_SQLite extensions.
Merge branch 'sqlite_backend'

Conflicts:
	src/Erebot/Module/Wordlists/Wordlist.php
CameraHAL: Revert back to the "original" one from Evervolv

https://github.com/Evervolv/android_hardware_qcom_camera
Fix in frameworks_base_0001

Change-Id: I7ff1279839fedbf6b1f89f324cbfc049535bb580
Implement the use of OTA Update Center

https://otaupdatecenter.pro
make it no move when you click stuff and things
use from CM Gallery2 and MusicFX
Update files..

test test
Extract kam style name to constant
Added fixme
Prefixed all KAM styles so they are easier to identify in .props files
Extracted visual style creation to method
Bumped to new version v0.0.2
fixed "style" context in template (ember.js >= 0.9.8)
Merge pull request #32 from lipp/master

fixed ProgressBar "style" context
Merge branch 'master' of git://github.com/emberjs-addons/ember-bootstrap
Completed Model section
Merge remote branch 'github/report' into report
Added script for plotting sine fits, for comparison
Removed references from abstract
Edited foreignabstract.m
Edited introduction.tex
Formatted introduction.tex
Further edited introduction.tex
Done with the structure for the base, need testing and gui
most of the desktop stuff comming in
Support wildcards in TestSwarm browserSets.

Ref: jquery/testswarm:
 [master 2aa7466] BrowserInfo: Implement wildcard system.

Also add mapping in the other direction to cover for lack of
Windows OS version distinction in browserstack API
(Windows XP/7/8 -> Windows).
use camelCase
Merge branch 'master' of git://github.com/Kunstmaan/KunstmaanAdminBundle

* 'master' of git://github.com/Kunstmaan/KunstmaanAdminBundle:
  code cleanup
Merge branch 'master' into feature/fix_guest_user_listener
refactoring andy code
progress
location path work
Log some messages about followup cleanup tasks.
GUI display changes
guard for radio
use external LED instead
comments
bugfix;LEDs are active high, not low; switched to smaller leds implementation
added lots of defines, changed a few, more comments
license, removed obsolete defines
removed obsolete defines, better comments, SPI and GDO definitions
Completed about_true_and_false ruby koan
Adding Documentation Support
Implementation of tests for documentation library
Correction of a path bug on documentation linrary
Adding a method to get the two letter global culture into Documentation library
adding cache gestion on documentation page
Added Documentations Stylesheet
Renaming wrong named directory
Adding User Authentification Library
Start to enable facebook authentification in the auth library
some more info for imprint, remove obsolete folder in robot.txt, add files
Updated TileMap, should work better with Tiled Map Editor. Also added some stuff to start setting up the Camera class settings.
Merge pull request #7 from ffleck/master

TileMap Update
Created the SealayerDrawer class which makes the scenery fade in the horizon, making the world look smoother and hiding the area where rocks and stuff are created.
lololo
Merge pull request #42 from MiloTischler/rzy

lololo
made changes to front end design
Fix USB Mass Storage
Committed master files
fixed a read error in when loading the config.yml if one already exists
improved building scripts
put stuff in onload && fixed bugs
Merge branch 'master' of github.com:NHL-Water-Apps/Base-App-Improv
added link to site in e-mail message
updated to run against Solr 4.0.  Solr 4 gives an error if the uid
(layerid) is multivalue, so this has been changed, along with necessary
code changes. The value for layerId is extracted from the array early in
all processes, so changes were very minor.  (SolrRecord,
DownloadHandlerImpl, ImageController) The results table in the client
code already autodetects whether a field is an array, so it works
without issues.  The layerId is also directly obtained from Solr when
metadata is displayed, so a change was needed here.

404.png was not being found.  Moved to resources/media

fixed an issue where the OpenStreetMap didn't always track with the
Google maps base map.

added loading indicator back for getfeatureinfo requests.
Merge pull request #1 from chrissbarnett/master

solr4 support, small fixes
Merge pull request #1 from TuftsOGP/master

merging changes from TuftsOGP
Updates for SuRi Web UI.
Fix for ! bug with dial pattern
fixed typos
Restore full snooze prompts
Fix snooze prompt repetition
Fix for ! bug with dial pattern
fixed typos
Restore full snooze prompts
Fix snooze prompt repetition
Merge remote-tracking branch 'origin/working' into working
Minor GUI fix
Disable auto check for update
Merge pull request #43 from POSSA/working

Update master to 2.11.0beta2
Correct polish language package
Fix details with avatars
Using different mysql gem
Using different mysql gem
Bump gems
Version bump to 1.0.1
Changed Name in the footer
fixed getAll
removed some more logging
Merge branch 'master' into gh-pages
build: Wed Oct 10 12:35:11 UTC 2012
Added art direction image
Allow the baseFolder to be relative to the working directory and make sure it is converted into an absolute path for comparison purposes.
Wire up load Transport Extension event handles (Without this change it's not possible to load transport extensions)
detect changes from merges, thanks go to linquize
Merge branch 'master' of https://github.com/ccnet/CruiseControl.NET
Merge pull request #95 from Stonie/WireUpTransportExtension

Wire up load Transport Extension event handles 
Merge pull request #94 from dodgyrabbit/master

baseFolder relative to working directory for PackageFolder
Merge branch 'master' of https://github.com/ccnet/CruiseControl.NET
tooltip provider for messages may only handle real messages,
not build related ones
fixes (Bug #104) : The CCTray app balloon shows always report builds even if it is set only to show warnings or errors.
Setup Base for Carton
Implement anchor element opening tag finder
new attributes in model
successful execution of static files
Vsync disabled and slim.dependencies fixed
Diable vsync, update build props,  overlay and slim.dependencies

clean some old pesky tabs

Change-Id: I98db11caa25b0b7b76846116e196fa3491d4f7ca
fixing inconsistencies with the spelling of the word "defense" - standardised on US spelling
Bugfix: Vorher Exception wenn eine Bullet ein Asterodi trifft, SpaceLemon kommentiert
added admin controll to footer
removed redundand line in GameManager
add verizon add the clientidbase
power: Extend power module definition.

Add member function pointers to the power
module header. The new function pointers are
to enable applications to indicate that
video encoding has started or stopped.

Change-Id: Ic71ec1f4e159673bcb14f7e32b6058da1bce3ba5
Merge commit 'power: Extend power module definition.' into jb
Harpy sex
Fire House tweak
Fixed Metrics Graphs
Formated SimpleRouteMatcher
Refactored route generation
Passing down the HttpMethod, rather than embedding it to a String.
Added a test for POST condition

Tests the condition where response and status is
given.
[LED]fix wrong port
call plotting in method run_plots
Site updated at 2012-09-12 21:59:55 UTC
validations and error messages added
Added associative array variable

First trial for an associative array variable to store the value of
number of components for each unit.
Associative array solution

Much better solution for an associative array in XSLT.

Solution inspired by
http://stackoverflow.com/questions/3626118/xslt-creating-a-map-in-xslt
Xpath solution for mutiple units

No need for an associative array. Xpath is enough inthis case.
parametric generation of folded flyleaves
Added gluedpattern to masterSVG

Completed folded separate flyleaves
Parametrical funct: separate pastedown type fold

Added parametrical functioning for separate pastedown type fold
Flyleaf type guard
Finished Separate Endleaves
Compensated for textHook and multiple units

Adjusted code to accommodate multiple units
Finished both separate and integral endleaves
Slight modifications to deal w/ NC/NK pastedowns
First trials of visualizing uncertain info
Gaussian blur effect for uncertainty
Gaussian blur effect for uncertainty
Sewing path dasharray
Sewing transformation allows for mutiple groups

Each sewing sequence (grouped by stations/station/group[current |
previous | earlier] is drawn independently and in sequence.
Implementation of uncertainty by blur
Station preparation

Code modified to allo for sewing station preparation
Recessed and flat sewing supports
sewing
fix author show. test author, book show. color admin elements red.
deleted installation directory post initial config
Adding check for CSS files
more column wrangling
Chnaged page title
nice rotation
Site updated at 2012-05-09 00:43:44 UTC
ahora si!!
New version of node-natural usage
refactored views so not all is in layout
commented out spec abt edit link for admins
improving home carusel animation
Fixed bug with finding current path basename [#2]
First set of promises. Better README.rst
part_detect_tool for p4
model,view,controller for tags
Merge branch 'develop' of github.com:amruta-webonise/git.assignment into develop
Site updated at 2012-04-09 15:40:28 UTC
Usernames are used for the main user's page. #93
Added Readme and adjusted AssemblyInfo
ARQGRA-239 Shading cglib and objenenis proxying dependecies
ARQGRA-239: dependency cleanup
ARQGRA-242: removed Guava, Commons-* and JBoss Logging dependencies
ship views filter
Fixed bug where BSD::Resource was not being loaded on OSX
Merge pull request #1 from stocks29/master

Fixed bug where BSD::Resource was not being loaded on OSX
Dependency requires 'json' rather than 'json/pure'
Version bump to 1.4.0
Added docs for creating subscriber and callback_urls
fixed typo in sessions helper
cleaning up some styles
fixed header to properly use session helper
fixed typo on gift view
Import of Trebuchet features into Launcher2

Change-Id: Id51bab0510e241e4f4c1c56701e50c9b1f65f08a
Register launcher settings intent for settings app

Change-Id: I9e94fbacef9b10e027990121353f19692c8f89cd
Restore preference for number of homescreens

Change-Id: Ifa5701c5c4fc8ff2a4b10ec5b81dc4b768766c8f
Maximize workspace size

Change-Id: If553661908b4490e9b0799d0e52c8e7fdb7560d4
Update SCREEN_COUNT and DEFAULT_SCREEN to use new functions

Change-Id: Ie5a1e5cfeaf68850f8e83a87f62ae15e14f83212
Open drawer on back

Change-Id: I5d634f527a057c414371fe58fa6b3d9c1ac2acee
Merge branch 'jellybean' of git://github.com/sgt7/android_packages_apps_Launcher2
Customisation and preferences update - Title changes.
Trying to add in some CSS selector specificity testing.
added background line
Add pointers to legal information for the anonymizeIp event
Added better error messaging so we can see which fields are required for videos
Removed slug from required fields
Version bump added better error messaging
Bumped version
Merge branch 'master' of github.com:bigbangtechnology/woople-theme
web100 userland
Merge branch 'master' of github.com:bismark-devel/bismark-packages
base plans
Added authentication with Sentry.

Register user and user login to manage post.
ToDo:
1. guard the post_user_login, post_user_register and the post_post_admin
2. provide logout and current user indicator on page.
3. figure out session timeout settings...
Rename misnamed file
dev settings, analytics
Sample commit after rebase
fix to keep the run loop going

Added overall duration to display and set operation to run on the
thread that keeps the run loop going to capture callbacks. The previous
version did not handle the run loop properly. There is also now an
option to run 16 concurrent connections.
[TIMOB-9410] Fixed a bug in table view row alignment.
added monodialog and added simple tabledesign
added code for background change; added price to menu
new buckets, changes from globe, various
Original code reformated.
First TrieNode prototype.
Signed files.
Working getPrefix().
825737: Service-level --set should configure proper value for GUI
Merge pull request #40 from wottop/bug825737

825737: Service-level --set should configure proper value for GUI
Rework urlparse calls to work with RHEL 5.
Merge pull request #26 from candlepin/awood/urlparse

Rework urlparse calls to work with RHEL 5.
Added a comment about CONTINUE zombie flag.
edit lab page
Site updated at 2012-10-14 10:19:57 UTC
Added CdliTwoStageSignup module
bessere Speicherverwaltung
Revert r156097, which appears to be causing some breakage.
Move TextTokenRetokenizer from CommentLexer.h to CommentParser.cpp since it is
an implementation detail of the parser.
add byog 2011 post
Merge pull request #8 from chrissim/master

Please do!
Merge pull request #9 from MoSheriff/master

Updated Graphics Stuff
UDP implemented
Merge pull request #10 from beamer1989/master

udp working
Changed Client to be singleton
Merge pull request #11 from beamer1989/master

singleton client
Added missing file
Update component templates
Update palaeontology.csl
Merge pull request #244 from ms609/patch-2

Update palaeontology.csl
New style for North West University.

Based on Elsevier Harvard style and 'Verwysingsgids' 2012.
Changes made according to validation tool.
Merge pull request #140 from Hermien/master

Please include style for the North West University in South Africa. Thank you.
Fixed link to example image on app detail page.
Added www to two links in here.
Merge pull request #2 from pencoyd/patch-1

Fixed link to example image on app detail page.
updated tenants.html with bootstrap
Update 20120302174041.markdown
test for content_type;
Add local for DE
Merge pull request #226 from RobWu/locales-de

Add local for DE
implement caching of page_id's
correct use of CouldNotScheduleJobException
Greatly improve OSX pb <---> tmux interactions.
Fix makefile dependency: add Test::Exception
ISO8601 and DateTime2 to support MinValues. Not supported in SQLCE4 and SQL2005, though.
Bumped v14.1.1
Merge branch 'develop'
Changed python project name: pyimagemagick.
Added documentation in code for the LiveHelpNow button.
Updated superflous padding for footer element.
Adding new spatial methods to FullTextQuery JPA version
intro and page title
Update spree_multi_lingual.gemspec

Updating depedencies
modified .gitignore to ignore sublime text projects
enabled error logging in Laravel
set default timezone to Toronto for the app
switched authentication to fluent, opposed to eloquent
adding user models
adding/modifying views for user create/edit
adding some error codes/messages for user actions
user routing...
save editor before submitting via serialize
Turning master into the deploy branch with the build
Added conduit related networking models.
Merge pull request #66 from cdearborn/pull-req-master-44840bc74d

Added conduit related network models [1/1]
Site updated at 2012-08-22 19:58:36 UTC
Added PHP installation as module
Merge branch 'php-module'
adding another try at democontent
added safe batter with aggression; added chance your arm; added some momentum rules
Bag Fix

2081 2082 2067 2066
Fixed background issue to retain a concrete background.
Added ubuntu installation script, updated readme.
Merge pull request #6 from faceleg/master

Added Ubuntu Installation Script
commenting out unknown #pragma

Avoid compilation warning (issue WP-131)
remove unused bcolumnoid variable

Avoid compilation warning (issue WP-131)
removed unused err variable

avoid compilation warning (issue WP-131)
on error, scan next device

also, avoid compilation warning (wp-131)
Zram currently uses LZO compression. With Snappy, it uses less CPU ti.

.me and is

thus more useful. The sacrifice in compression ratio is small.
Zram's LZO and Snappy support can be independently enabled at compile time and
each zram device can switch between compression methods when unused.
When only a single compression method was enabled at compile time, no idirection
penalty is incurred.

Signed-off-by: Zeev Tarantov <zeev.tarantov at gmail.com>

Fixed and adapted by dorimanx, found by VOKU! :)

========================================================

Google's Snappy data compression library is a faster alternative to LZO,

optimized for x86-64. On compressible input it compresses ~2.5x faster than LZO
and decompresses ~1.5-2x faster than LZO. On incompressible input, it skips the
input at 100x faster than LZO and decompresses ~4x faster than LZO.
It is released under BSD license.
This is a kernel port from user space C++ code.
The current intended use is with zram (see next patch in series).

Signed-off-by: Zeev Tarantov <zeev.tarantov at gmail.com>
---
Changelog:
v3: added forgotten staging/snappy/Kconfig
second part of patch is the same:
http://driverdev.linuxdriverproject.org/pipermail/devel/2011-April/015114.html
v2: move to staging, run checkpatch
http://driverdev.linuxdriverproject.org/pipermail/devel/2011-April/015113.html

Thanks to VOKU!
========================================================
Tuned the PM as was before, this is kernel 5.8-Beta-1
Make tests pass when run from an XPI
event-stream: remove extraneous whitespace that confuses some json libraries
event-stream: let timestamp-fixer correct multiple clock jumps during boot
creating matrix in the loop
updated RedditSearch sub specific header
updated RedditSubSearch header
add DetectLang plugin
add test for DetectLang
initial commit
preferred username in header
first commit
added href to images
fixed
fixed email
a bunch of fixes
added styles to css, fixed about
removed </a>
id for div
check return value in DetectLang
add more triggers in DetectLang
use % to show confidence in DetectLang
fix missing detections in DetectLang
fix unknown languages in DetectLang
sort results by confidence in DetectLang
use ceil instead of floor to avoid 0% confidence in DetectLang
removed unnecessary files
Added content to the coding and ui projects pages. They aren't done, but it's a start.
* adding tile6 texture to cube example
* recompiled examples against latest swc
disabled update
* patch needed also for Net::SSH::Perl 1.35
Added geocoding for AYY event addresses and reverse geocoding for Aalto geo locations
Merge branch 'master' of github.com:espu/T111-5360.WebApplications
First commit
Persistent socket connection, 4x speedup
-1 in bulk reply now returns null
Added clustering, some tests
Fixed up readme
Fixed up readme... again. I need a Markdown previewer.
Spelling errors.
More documentation, added another test
fgets's length param is optional, it returns on newline, changed all calls to it
Missed one of those fgets'
Made bulk/multibulk binary-safe
Bulk reply fix
Made multi-bulk reply binary safe
Fixed  bug
Bulk replies over 8096 bytes can now be read, and are binary-safe
Modifying bulk reply response chunks to be concatenated rather than overwritten.
switched to the unified request protocol
php5-ized some things
Merge branch 'master' of https://github.com/KevBurnsJr/redisent into KevBurnsJr-master
Updated README to reflect namespacing
changed 'apply now' to 'how to apply'
added URL forwarding for ProgramDocuments
added msg for zabbix conf check
javadoc update.
Code reorganization in @Time and @With extensions.
Global extensions applied.
add bootstrap to assets precompile
Comments warnings: broken references
WEJA-14: Implement the Builder system for creating and executing API
operations 
WEJA-14: Implement the Builder system for creating and executing API
operations
WEJA-17: Implement Exception handling
WEJA-6: Implement CRUD operation for public services 
Clean resources.
Update verswion number for matching JIRA version.
Merge branch 'master' of git.evrythng.net:evrythng/evrythng-java-wrapper

Conflicts:
	src/main/java/com/evrythng/api/wrapper/service/RestTemplate.java
add SSHDResources, remove SSHDUsers, improve SSHDAlertDialog, add SSHDListDialog, handle issue #7139, improve DefaultUser, improve UserDialog, UserFragment, refactoring, minor fixes
fix usage string to reflect the new binary
bump npm version 1.0.2
ca fv
Site updated at 2012-07-06 11:33:22 UTC
initial pages for class 5
Pruebas unitarias login
change the copy right
forgot to add files
secret key
Site updated at 2012-09-19 06:59:14 UTC
Date...
testing testing, unit tests are added, int.tests are halfway
re-generate gemspec ("rake gemspec")
fix over enthusiastic attempt to create an interface on any edit of a host
updated the cURL call and updated the info file
commit
bln: refactor implementation

* split led control and hardware init
* touchkey driver keep track of state (ongoing)
* export function to touch driver for clearing bln
* cleanup bln driver blink support
* cleanup bln driver log messages
bugfix with array_search
added examples for store remote
p not allowed as child of element span
virtualenv v1.7.2
pip v1.1
patched pip v1.1
resolved the floating search issue by changing the z-index to 1 instead of 999
Correct the data operation name
Refactoring and add list of wiki pages to front page
jruby: Speed up gems recipe by testing against file on disc, not chef-jgem
Merge branch 'master' of github.com:infochimps-labs/ironfan-pantry
To be possible to pass in an array of post types.
Bug fix
in directory
Merge pull request #1 from inc2734/develop/multi_custom_post_type

Support for multiple post types (Thanks @inc2734)
Moving files back out of directory
Cleaning up query format and removing some unneeded code
Custom post type support for widget
Fixing small bug in query
Updating version and readme
Few small readme changes
Merge branch 'master' of git://github.com/MattGeri/WP-Most-Popular

Conflicts:
	system/widget.php

Updated from Matt's master before committing and sending pull request
Readding edits after pull from mattgeri master
metadata min/max parsing for ps
fixing some tests, remove unused response class
add rank histogram to validator
small test logging change
Listview to datagridview.
updated pricing on search form to prepopulate
Revert "Passed specs for feature"

This reverts commit 6da4847adc780630f3fc2526dc5cf9e7ba48f548.

Conflicts:

	app/models/feature.rb
	db/schema.rb
Cocked up the revert, should be back to before association now